Merge master into staging-next
This commit is contained in:
@@ -121,6 +121,8 @@
|
||||
|
||||
- [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable).
|
||||
|
||||
- [OpenGamepadUI](https://github.com/ShadowBlip/OpenGamepadUI/), an open source gamepad-native game launcher and overlay for Linux. Available as [programs.opengamepadui](#opt-programs.opengamepadui.enable).
|
||||
|
||||
- [InputPlumber](https://github.com/ShadowBlip/InputPlumber/), an open source input router and remapper daemon for Linux. Available as [services.inputplumber](#opt-services.inputplumber.enable).
|
||||
|
||||
- [PowerStation](https://github.com/ShadowBlip/PowerStation/), an open source TDP control and performance daemon with DBus interface for Linux. Available as [services.powerstation](#opt-services.powerstation.enable).
|
||||
|
||||
@@ -107,18 +107,19 @@ def _preprocess_screenshot(screenshot_path: str, negate: bool = False) -> str:
|
||||
"1",
|
||||
"-posterize",
|
||||
"3",
|
||||
"-gamma",
|
||||
"100",
|
||||
"-blur",
|
||||
"1x65535",
|
||||
]
|
||||
|
||||
out_file = screenshot_path
|
||||
|
||||
if negate:
|
||||
magick_args.append("-negate")
|
||||
out_file += ".negative"
|
||||
|
||||
magick_args += [
|
||||
"-gamma",
|
||||
"100",
|
||||
"-blur",
|
||||
"1x65535",
|
||||
]
|
||||
out_file += ".png"
|
||||
|
||||
ret = subprocess.run(
|
||||
|
||||
@@ -267,6 +267,7 @@
|
||||
./programs/ns-usbloader.nix
|
||||
./programs/oblogout.nix
|
||||
./programs/oddjobd.nix
|
||||
./programs/opengamepadui.nix
|
||||
./programs/openvpn3.nix
|
||||
./programs/obs-studio.nix
|
||||
./programs/partition-manager.nix
|
||||
|
||||
@@ -0,0 +1,271 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.programs.opengamepadui;
|
||||
gamescopeCfg = config.programs.gamescope;
|
||||
|
||||
opengamepadui-gamescope =
|
||||
let
|
||||
exports = lib.mapAttrsToList (n: v: "export ${n}=${v}") cfg.gamescopeSession.env;
|
||||
in
|
||||
# Based on gamescope-session-plus from ChimeraOS
|
||||
pkgs.writeShellScriptBin "opengamepadui-gamescope" ''
|
||||
${builtins.concatStringsSep "\n" exports}
|
||||
|
||||
# Enable Mangoapp
|
||||
export MANGOHUD_CONFIGFILE=$(mktemp /tmp/mangohud.XXXXXXXX)
|
||||
export RADV_FORCE_VRS_CONFIG_FILE=$(mktemp /tmp/radv_vrs.XXXXXXXX)
|
||||
|
||||
# Plop GAMESCOPE_MODE_SAVE_FILE into $XDG_CONFIG_HOME (defaults to ~/.config).
|
||||
export GAMESCOPE_MODE_SAVE_FILE="''${XDG_CONFIG_HOME:-$HOME/.config}/gamescope/modes.cfg"
|
||||
export GAMESCOPE_PATCHED_EDID_FILE="''${XDG_CONFIG_HOME:-$HOME/.config}/gamescope/edid.bin"
|
||||
|
||||
# Make path to gamescope mode save file.
|
||||
mkdir -p "$(dirname "$GAMESCOPE_MODE_SAVE_FILE")"
|
||||
touch "$GAMESCOPE_MODE_SAVE_FILE"
|
||||
|
||||
# Make path to Gamescope edid patched file.
|
||||
mkdir -p "$(dirname "$GAMESCOPE_PATCHED_EDID_FILE")"
|
||||
touch "$GAMESCOPE_PATCHED_EDID_FILE"
|
||||
|
||||
# Initially write no_display to our config file
|
||||
# so we don't get mangoapp showing up before OpenGamepadUI initializes
|
||||
# on OOBE and stuff.
|
||||
mkdir -p "$(dirname "$MANGOHUD_CONFIGFILE")"
|
||||
echo "no_display" >"$MANGOHUD_CONFIGFILE"
|
||||
|
||||
# Prepare our initial VRS config file
|
||||
# for dynamic VRS in Mesa.
|
||||
mkdir -p "$(dirname "$RADV_FORCE_VRS_CONFIG_FILE")"
|
||||
echo "1x1" >"$RADV_FORCE_VRS_CONFIG_FILE"
|
||||
|
||||
# To play nice with the short term callback-based limiter for now
|
||||
export GAMESCOPE_LIMITER_FILE=$(mktemp /tmp/gamescope-limiter.XXXXXXXX)
|
||||
|
||||
ulimit -n 524288
|
||||
|
||||
# Setup socket for gamescope
|
||||
# Create run directory file for startup and stats sockets
|
||||
tmpdir="$([[ -n ''${XDG_RUNTIME_DIR+x} ]] && mktemp -p "$XDG_RUNTIME_DIR" -d -t gamescope.XXXXXXX)"
|
||||
socket="''${tmpdir:+$tmpdir/startup.socket}"
|
||||
stats="''${tmpdir:+$tmpdir/stats.pipe}"
|
||||
|
||||
# Fail early if we don't have a proper runtime directory setup
|
||||
if [[ -z $tmpdir || -z ''${XDG_RUNTIME_DIR+x} ]]; then
|
||||
echo >&2 "!! Failed to find run directory in which to create stats session sockets (is \$XDG_RUNTIME_DIR set?)"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
export GAMESCOPE_STATS="$stats"
|
||||
mkfifo -- "$stats"
|
||||
mkfifo -- "$socket"
|
||||
|
||||
# Start gamescope compositor, log it's output and background it
|
||||
echo gamescope ${lib.escapeShellArgs cfg.gamescopeSession.args} -R $socket -T $stats >"$HOME"/.gamescope-cmd.log
|
||||
gamescope ${lib.escapeShellArgs cfg.gamescopeSession.args} -R $socket -T $stats >"$HOME"/.gamescope-stdout.log 2>&1 &
|
||||
gamescope_pid="$!"
|
||||
|
||||
if read -r -t 3 response_x_display response_wl_display <>"$socket"; then
|
||||
export DISPLAY="$response_x_display"
|
||||
export GAMESCOPE_WAYLAND_DISPLAY="$response_wl_display"
|
||||
# We're done!
|
||||
else
|
||||
echo "gamescope failed"
|
||||
kill -9 "$gamescope_pid"
|
||||
wait -n "$gamescope_pid"
|
||||
exit 1
|
||||
# Systemd or Session manager will have to restart session
|
||||
fi
|
||||
|
||||
# If we have mangoapp binary start it
|
||||
if command -v mangoapp >/dev/null; then
|
||||
(while true; do
|
||||
sleep 1
|
||||
mangoapp >"$HOME"/.mangoapp-stdout.log 2>&1
|
||||
done) &
|
||||
fi
|
||||
|
||||
# Start OpenGamepadUI
|
||||
opengamepadui ${lib.escapeShellArgs cfg.args}
|
||||
|
||||
# When the client exits, kill gamescope nicely
|
||||
kill $gamescope_pid
|
||||
'';
|
||||
|
||||
gamescopeSessionFile =
|
||||
(pkgs.writeTextDir "share/wayland-sessions/opengamepadui.desktop" ''
|
||||
[Desktop Entry]
|
||||
Name=opengamepadui
|
||||
Comment=OpenGamepadUI Session
|
||||
Exec=${opengamepadui-gamescope}/bin/opengamepadui-gamescope
|
||||
Type=Application
|
||||
'').overrideAttrs
|
||||
(_: {
|
||||
passthru.providedSessions = [ "opengamepadui" ];
|
||||
});
|
||||
in
|
||||
{
|
||||
options.programs.opengamepadui = {
|
||||
enable = lib.mkEnableOption "opengamepadui";
|
||||
|
||||
args = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Arguments to be passed to OpenGamepadUI
|
||||
'';
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs "OpenGamepadUI" {
|
||||
default = [ "opengamepadui" ];
|
||||
};
|
||||
|
||||
extraPackages = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = [ ];
|
||||
example = lib.literalExpression ''
|
||||
with pkgs; [
|
||||
gamescope
|
||||
]
|
||||
'';
|
||||
description = ''
|
||||
Additional packages to add to the OpenGamepadUI environment.
|
||||
'';
|
||||
};
|
||||
|
||||
fontPackages = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = config.fonts.packages;
|
||||
defaultText = lib.literalExpression "builtins.filter lib.types.package.check config.fonts.packages";
|
||||
example = lib.literalExpression "with pkgs; [ source-han-sans ]";
|
||||
description = ''
|
||||
Font packages to use in OpenGamepadUI.
|
||||
|
||||
Defaults to system fonts, but could be overridden to use other fonts — useful for users who would like to customize CJK fonts used in opengamepadui. According to the [upstream issue](https://github.com/ValveSoftware/opengamepadui-for-linux/issues/10422#issuecomment-1944396010), opengamepadui only follows the per-user fontconfig configuration.
|
||||
'';
|
||||
};
|
||||
|
||||
gamescopeSession = lib.mkOption {
|
||||
description = "Run a GameScope driven OpenGamepadUI session from your display-manager";
|
||||
default = { };
|
||||
type = lib.types.submodule {
|
||||
options = {
|
||||
enable = lib.mkEnableOption "GameScope Session";
|
||||
args = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [
|
||||
"--prefer-output"
|
||||
"*,eDP-1"
|
||||
"--xwayland-count"
|
||||
"2"
|
||||
"--default-touch-mode"
|
||||
"4"
|
||||
"--hide-cursor-delay"
|
||||
"3000"
|
||||
"--fade-out-duration"
|
||||
"200"
|
||||
"--steam"
|
||||
];
|
||||
description = ''
|
||||
Arguments to be passed to GameScope for the session.
|
||||
'';
|
||||
};
|
||||
|
||||
env = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.str;
|
||||
default = { };
|
||||
description = ''
|
||||
Environmental variables to be passed to GameScope for the session.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
inputplumber.enable = lib.mkEnableOption ''
|
||||
Run InputPlumber service for input management and gamepad configuration.
|
||||
'';
|
||||
|
||||
powerstation.enable = lib.mkEnableOption ''
|
||||
Run PowerStation service for TDP control and performance settings.
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
hardware.graphics = {
|
||||
# this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932
|
||||
enable = true;
|
||||
enable32Bit = pkgs.stdenv.hostPlatform.isx86_64;
|
||||
};
|
||||
|
||||
security.wrappers = lib.mkIf (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) {
|
||||
# needed or steam plugin fails
|
||||
bwrap = {
|
||||
owner = "root";
|
||||
group = "root";
|
||||
source = lib.getExe pkgs.bubblewrap;
|
||||
setuid = true;
|
||||
};
|
||||
};
|
||||
|
||||
programs.opengamepadui.extraPackages = cfg.fontPackages;
|
||||
|
||||
programs.gamescope.enable = true;
|
||||
services.displayManager.sessionPackages = lib.mkIf cfg.gamescopeSession.enable [
|
||||
gamescopeSessionFile
|
||||
];
|
||||
|
||||
programs.opengamepadui.gamescopeSession.env = {
|
||||
# Fix intel color corruption
|
||||
# might come with some performance degradation but is better than a corrupted
|
||||
# color image
|
||||
INTEL_DEBUG = "norbc";
|
||||
mesa_glthread = "true";
|
||||
# This should be used by default by gamescope. Cannot hurt to force it anyway.
|
||||
# Reported better framelimiting with this enabled
|
||||
ENABLE_GAMESCOPE_WSI = "1";
|
||||
# Force Qt applications to run under xwayland
|
||||
QT_QPA_PLATFORM = "xcb";
|
||||
# Some environment variables by default (taken from Deck session)
|
||||
SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS = "0";
|
||||
# There is no way to set a color space for an NV12
|
||||
# buffer in Wayland. And the color management protocol that is
|
||||
# meant to let this happen is missing the color range...
|
||||
# So just workaround this with an ENV var that Remote Play Together
|
||||
# and Gamescope will use for now.
|
||||
GAMESCOPE_NV12_COLORSPACE = "k_EStreamColorspace_BT601";
|
||||
# Workaround older versions of vkd3d-proton setting this
|
||||
# too low (desc.BufferCount), resulting in symptoms that are potentially like
|
||||
# swapchain starvation.
|
||||
VKD3D_SWAPCHAIN_LATENCY_FRAMES = "3";
|
||||
# To expose vram info from radv
|
||||
WINEDLLOVERRIDES = "dxgi=n";
|
||||
# Don't wait for buffers to idle on the client side before sending them to gamescope
|
||||
vk_xwayland_wait_ready = "false";
|
||||
# Temporary crutch until dummy plane interactions / etc are figured out
|
||||
GAMESCOPE_DISABLE_ASYNC_FLIPS = "1";
|
||||
};
|
||||
|
||||
# optionally enable 32bit pulseaudio support if pulseaudio is enabled
|
||||
services.pulseaudio.support32Bit = config.services.pulseaudio.enable;
|
||||
services.pipewire.alsa.support32Bit = config.services.pipewire.alsa.enable;
|
||||
|
||||
hardware.steam-hardware.enable = true;
|
||||
|
||||
services.inputplumber.enable = lib.mkDefault cfg.inputplumber.enable;
|
||||
services.powerstation.enable = lib.mkDefault cfg.powerstation.enable;
|
||||
|
||||
environment.pathsToLink = [ "/share" ];
|
||||
|
||||
environment.systemPackages = [
|
||||
cfg.package
|
||||
] ++ lib.optional cfg.gamescopeSession.enable opengamepadui-gamescope;
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ shadowapex ];
|
||||
}
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.1.11";
|
||||
hash = "sha256-DxeMTbbDXofhq4+WvO8fpczyxorSJSw6bU3c8xFdDgg=";
|
||||
version = "3.2.5";
|
||||
hash = "sha256-aJnN5zjF6tvUSMqVklNgCgpsfBNi1vw0i66BBFgHB1o=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -3,23 +3,23 @@
|
||||
{
|
||||
"kicad" = {
|
||||
kicadVersion = {
|
||||
version = "8.0.7";
|
||||
version = "8.0.8";
|
||||
src = {
|
||||
rev = "bfcc0ac495d7a5fcfc5546c07bf16049d346b795";
|
||||
sha256 = "0k3xn2pkn4lw9jqx1l5r1h91x2azkq4b9zzhrq15cr4jw8af1y8w";
|
||||
rev = "069af84a1114b28d967dbdb15ac21ef39fc5273f";
|
||||
sha256 = "1672aii6902m1njgrh9hsfywcz0m7ryjsc2mkngr3frg6pg4yqp2";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "8.0.7";
|
||||
version = "8.0.8";
|
||||
libSources = {
|
||||
symbols.rev = "42f411da32d930a1255a9e842859d6ff8f034b17";
|
||||
symbols.sha256 = "0fp56xs7jb1pmqjammq0wkr5cq1fz1a3y3jriavxs09mrb56nghl";
|
||||
templates.rev = "8402f4c99a45cfbb2ba5185a975f60fb6718d631";
|
||||
templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza";
|
||||
footprints.rev = "e40b11ba8b166956f1a654fa02613f65683ae20d";
|
||||
footprints.sha256 = "1ssrmx2bh6v4psg89q0l69d40jj10adz0506p2mq5yc1sgy0bag2";
|
||||
packages3d.rev = "27171b4df32b3e76e7b47098eae8e5ec61b136e5";
|
||||
packages3d.sha256 = "159dm48zm5n6301ck2w48alwgy5a2yl075hb94gy67bir4sc0ijb";
|
||||
symbols.rev = "b408fec68c5bee64b76d4e28829870f5932f7748";
|
||||
symbols.sha256 = "090pvx28sk0nkqzdm8xxlshqgfrmp7y7r1bblv4sz0k1iab4wd9l";
|
||||
templates.rev = "4a7825ea3365318e9d943e855b45d0da0708b287";
|
||||
templates.sha256 = "1vpfh7ihi00c2cjla24a2dm4cwlrklivbig5zihrylj3185p01cr";
|
||||
footprints.rev = "3cb185423ec819cc0808cef440c1567fe45bb3f5";
|
||||
footprints.sha256 = "1z5bnvavjaxy52ydlp6dbqbr7dxiddhnmn56g0l58iva1xsr9gvj";
|
||||
packages3d.rev = "f0a2e3b29f57d39f4c8a5e4d622e2eda90719385";
|
||||
packages3d.sha256 = "1cqj6lnqj0qa4j203wrny8bsxp2zsfgpf96xy7nq4i968la6b88z";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
, patchelf
|
||||
}:
|
||||
let
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
# Patch for airshipper to install veloren
|
||||
patch = let
|
||||
runtimeLibs = [
|
||||
@@ -63,10 +63,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "Veloren";
|
||||
repo = "airshipper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V8G1mZIdqf+WGcrUzRgWnlUk+EXs4arAEQdRESpobGg=";
|
||||
hash = "sha256-MHwyXCAqdBzdJlYzSeUXr6bJdTVHcjJ/kGcuAsZCCW8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-N2FZZGbsAJdmBthsl1Be+kLMjI65yzMcbnBkgvdfDLM=";
|
||||
cargoHash = "sha256-mdII6CcSQkKZRWLiTJFCrhhkiqJJ5aTQ6vuf9uYGj/I=";
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
|
||||
@@ -93,9 +93,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "appflowy";
|
||||
desktopName = "AppFlowy";
|
||||
comment = finalAttrs.meta.description;
|
||||
exec = "appflowy";
|
||||
exec = "appflowy %U";
|
||||
icon = "appflowy";
|
||||
categories = [ "Office" ];
|
||||
mimeTypes = [ "x-scheme-handler/appflowy-flutter" ];
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -3,22 +3,23 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aws-nuke";
|
||||
version = "2.25.0";
|
||||
version = "3.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rebuy-de";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Yc9GXdcSKPvwddh+QU2/pBC0XIqA53wpd0VNKOqppbU=";
|
||||
owner = "ekristen";
|
||||
repo = "aws-nuke";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cYKVKJWIX3MqjN4LzNjBuvdsUSxF63L5MaFxW9gzyQQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FZ92JoyPYysYhl7iQZ8X32BDyNKL1UbOgq7EhHyqb5A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
vendorHash = "sha256-NPp6ivngNX0cQCUx4ZEP29t3+uuy5o1z0KcA65YUZ9k=";
|
||||
|
||||
overrideModAttrs = _: {
|
||||
preBuild = ''
|
||||
@@ -26,28 +27,48 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/ekristen/aws-nuke/v${lib.versions.major version}/pkg/common.SUMMARY=${version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd aws-nuke \
|
||||
--bash <($out/bin/aws-nuke completion bash) \
|
||||
--fish <($out/bin/aws-nuke completion fish) \
|
||||
--zsh <($out/bin/aws-nuke completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nuke a whole AWS account and delete all its resources";
|
||||
homepage = "https://github.com/rebuy-de/aws-nuke";
|
||||
changelog = "https://github.com/rebuy-de/aws-nuke/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ grahamc ];
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
postInstallCheck = ''
|
||||
$out/bin/aws-nuke resource-types | grep "IAMUser"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Remove all the resources from an AWS account";
|
||||
homepage = "https://github.com/ekristen/aws-nuke";
|
||||
changelog = "https://github.com/ekristen/aws-nuke/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ grahamc ];
|
||||
mainProgram = "aws-nuke";
|
||||
# fork/exec exe/mockgen: exec format error
|
||||
# resources/autoscaling_mock_test.go:1: running "../mocks/generate_mocks.sh": exit status 1
|
||||
broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "badrobot";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mLBJLeB85QeC4PYH4FyOI8lHz1OxIJlJbqgDfXTNnhM=";
|
||||
sha256 = "sha256-U3b5Xw+GjnAEXteivztHdcAcXx7DYtgaUbW5oax0mIk=";
|
||||
};
|
||||
vendorHash = "sha256-SB7gGgm7BwMSo4ocKX4UGB+OdjVY92S5YZfOmTl4VEk=";
|
||||
vendorHash = "sha256-oYdkCEdrw1eE5tnKveeJM3upRy8hOVc24JNN1bLX+ec=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -904,7 +904,7 @@
|
||||
#line 905 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
-main(){return(0);}
|
||||
+int main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
@@ -1,19 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bdfresize";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchurl {
|
||||
src = fetchzip {
|
||||
url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/bdfresize-${version}.tar.gz";
|
||||
hash = "sha256-RAz8BiCgI35GNSwUoHdMqj8wWXWbCiDe/vyU6EkIl6Y=";
|
||||
hash = "sha256-C4ZLJIn6vVeVUCpNwMu0vdfQQ3qUz4EVIcPob9NejP0=";
|
||||
};
|
||||
|
||||
patches = [ ./remove-malloc-declaration.patch ];
|
||||
patches = [
|
||||
./fix-configure.patch
|
||||
./remove-malloc-declaration.patch
|
||||
];
|
||||
|
||||
# Fix compilation of getopt; see getopt package for more details
|
||||
env.NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to resize BDF fonts";
|
||||
|
||||
@@ -2,16 +2,36 @@
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
id="$1"
|
||||
pids="$(pgrep -f "sleep $id" || :)"
|
||||
if [ -z "$pids" ]; then
|
||||
echo "Error: No process found for 'sleep $id'. The build must still be running in order to attach. Also make sure it's not on a remote builder." >&2
|
||||
exit 1
|
||||
elif [ "$(echo "$pids" | wc -l)" -ne 1 ]; then
|
||||
echo "Error: Multiple processes found matching 'sleep $id'" >&2
|
||||
exit 1
|
||||
fi
|
||||
pid="$(echo "$pids" | head -n1)"
|
||||
# A shell implementation for pgrep as we don't want to depend on procps
|
||||
pgrep(){
|
||||
PATTERN="$1"
|
||||
for pid_dir in /proc/[0-9]*; do
|
||||
pid="${pid_dir##*/}"
|
||||
|
||||
# Attempt to open /proc/<PID>/cmdline for reading on a new file descriptor
|
||||
# If we can't read it (no permission or doesn't exist), skip
|
||||
exec {fd}< "$pid_dir/cmdline" 2>/dev/null || continue
|
||||
|
||||
cmdline=""
|
||||
# Read each null-delimited token from /proc/<PID>/cmdline
|
||||
# and join them with a space for easier pattern matching
|
||||
while IFS= read -r -d $'\0' arg <&$fd; do
|
||||
if [[ -z "$cmdline" ]]; then
|
||||
cmdline="$arg"
|
||||
else
|
||||
cmdline="$cmdline $arg"
|
||||
fi
|
||||
done
|
||||
|
||||
# Close the file descriptor
|
||||
exec {fd}>&-
|
||||
|
||||
# If cmdline is non-empty and matches the pattern, print the PID
|
||||
if [[ -n "$cmdline" && "$cmdline" =~ $PATTERN ]]; then
|
||||
echo "$pid"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# helper to extract variables from the build env
|
||||
getVar(){
|
||||
@@ -25,6 +45,17 @@ getVar(){
|
||||
| cut -d "=" -f 2
|
||||
}
|
||||
|
||||
id="$1"
|
||||
pids="$(pgrep "sleep $id" || :)"
|
||||
if [ -z "$pids" ]; then
|
||||
echo "Error: No process found for 'sleep $id'. The build must still be running in order to attach. Also make sure it's not on a remote builder." >&2
|
||||
exit 1s
|
||||
elif [ "$(echo "$pids" | wc -l)" -ne 1 ]; then
|
||||
echo "Error: Multiple processes found matching 'sleep $id'" >&2
|
||||
exit 1
|
||||
fi
|
||||
pid="$(echo "$pids" | head -n1)"
|
||||
|
||||
# bash is needed to load the env vars, as we do not know the syntax of the debug shell.
|
||||
# bashInteractive is used instead of bash, as we depend on it anyways, due to it being
|
||||
# the default debug shell
|
||||
@@ -35,12 +66,16 @@ debugShell="$(getVar debugShell)"
|
||||
pwd="$(readlink /proc/$pid/cwd)"
|
||||
|
||||
# enter the namespace of the failed build
|
||||
exec nsenter --mount --net --target "$pid" "$bashInteractive" -c "
|
||||
# bash needs to be executed with --init-file /build/env-vars to include the bash native
|
||||
# variables like ones declared via `declare -a`.
|
||||
# If another shell is chosen via `debugShell`, it will only have simple env vars avaialable.
|
||||
exec nsenter --mount --ipc --uts --pid --net --target "$pid" "$bashInteractive" -c "
|
||||
set -eu -o pipefail
|
||||
while IFS= read -r -d \$'\0' line; do
|
||||
export \"\$line\"
|
||||
done <&3
|
||||
exec 3>&-
|
||||
source /build/env-vars
|
||||
cd \"$pwd\"
|
||||
exec \"$debugShell\"
|
||||
" 3< /proc/$pid/environ
|
||||
if [ -n \"$debugShell\" ]; then
|
||||
exec \"$debugShell\"
|
||||
else
|
||||
exec \"$bashInteractive\" --init-file /build/env-vars
|
||||
fi
|
||||
"
|
||||
|
||||
@@ -6,9 +6,7 @@ breakpointHook() {
|
||||
|
||||
# provide the user with an interactive shell for better experience
|
||||
export bashInteractive="@bashInteractive@"
|
||||
if [ -z "$debugShell" ]; then
|
||||
export debugShell="@bashInteractive@"
|
||||
fi
|
||||
dumpVars
|
||||
|
||||
local id
|
||||
id="$(shuf -i 999999-9999999 -n1)"
|
||||
|
||||
@@ -1,24 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPackages,
|
||||
|
||||
bash,
|
||||
bashInteractive,
|
||||
coreutils,
|
||||
makeSetupHook,
|
||||
procps,
|
||||
util-linux,
|
||||
writeShellScriptBin,
|
||||
}:
|
||||
|
||||
let
|
||||
attach = writeShellScriptBin "attach" ''
|
||||
attach = buildPackages.writeShellScriptBin "attach" ''
|
||||
export PATH="${
|
||||
lib.makeBinPath [
|
||||
bash
|
||||
coreutils
|
||||
procps # needed for pgrep
|
||||
util-linux # needed for nsenter
|
||||
buildPackages.bash
|
||||
buildPackages.coreutils
|
||||
buildPackages.util-linuxMinimal # needed for nsenter
|
||||
]
|
||||
}"
|
||||
exec bash ${./attach.sh} "$@"
|
||||
|
||||
@@ -0,0 +1,131 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
writeScriptBin,
|
||||
appimageTools,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
nix-update-script,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cura-appimage";
|
||||
version = "5.9.0";
|
||||
|
||||
# Give some good names so the intermediate packages are easy
|
||||
# to recognise by name in the Nix store.
|
||||
appimageBinName = "cura-appimage-tools-output";
|
||||
wrapperScriptName = "${pname}-wrapper-script";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
|
||||
hash = "sha256-STtVeM4Zs+PVSRO3cI0LxnjRDhOxSlttZF+2RIXnAp4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
};
|
||||
|
||||
curaAppimageToolsWrapped = appimageTools.wrapType2 {
|
||||
inherit src;
|
||||
# For `appimageTools.wrapType2`, `pname` determines the binary's name in `bin/`.
|
||||
pname = appimageBinName;
|
||||
inherit version;
|
||||
extraPkgs = _: [ ];
|
||||
};
|
||||
|
||||
# The `QT_QPA_PLATFORM=xcb` fixes Wayland support, see https://github.com/NixOS/nixpkgs/issues/186570#issuecomment-2526277637
|
||||
# The `GTK_USE_PORTAL=1` fixes file dialog issues under Gnome, see https://github.com/NixOS/nixpkgs/pull/372614#issuecomment-2585663161
|
||||
script = writeScriptBin wrapperScriptName ''
|
||||
#!${stdenv.shell}
|
||||
# AppImage version of Cura loses current working directory and treats all paths relateive to $HOME.
|
||||
# So we convert each of the files passed as argument to an absolute path.
|
||||
# This fixes use cases like `cd /path/to/my/files; cura mymodel.stl anothermodel.stl`.
|
||||
|
||||
args=()
|
||||
for a in "$@"; do
|
||||
if [ -e "$a" ]; then
|
||||
a="$(realpath "$a")"
|
||||
fi
|
||||
args+=("$a")
|
||||
done
|
||||
QT_QPA_PLATFORM=xcb GTK_USE_PORTAL=1 exec "${curaAppimageToolsWrapped}/bin/${appimageBinName}" "''${args[@]}"
|
||||
'';
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
wrapGAppsHook3
|
||||
];
|
||||
desktopItems = [
|
||||
# Based on upstream.
|
||||
# https://github.com/Ultimaker/Cura/blob/382b98e8b0c910fdf8b1509557ae8afab38f1817/packaging/AppImage/cura.desktop.jinja
|
||||
(makeDesktopItem {
|
||||
name = "cura";
|
||||
desktopName = "UltiMaker Cura";
|
||||
genericName = "3D Printing Software";
|
||||
comment = meta.longDescription;
|
||||
exec = "cura";
|
||||
icon = "cura-icon";
|
||||
terminal = false;
|
||||
type = "Application";
|
||||
mimeTypes = [
|
||||
"model/stl"
|
||||
"application/vnd.ms-3mfdocument"
|
||||
"application/prs.wavefront-obj"
|
||||
"image/bmp"
|
||||
"image/gif"
|
||||
"image/jpeg"
|
||||
"image/png"
|
||||
"text/x-gcode"
|
||||
"application/x-amf"
|
||||
"application/x-ply"
|
||||
"application/x-ctm"
|
||||
"model/vnd.collada+xml"
|
||||
"model/gltf-binary"
|
||||
"model/gltf+json"
|
||||
"model/vnd.collada+xml+zip"
|
||||
];
|
||||
categories = [ "Graphics" ];
|
||||
keywords = [
|
||||
"3D"
|
||||
"Printing"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp ${script}/bin/${wrapperScriptName} $out/bin/cura
|
||||
|
||||
mkdir -p $out/share/applications $out/share/icons/hicolor/128x128/apps
|
||||
install -Dm644 ${appimageContents}/usr/share/icons/hicolor/128x128/apps/cura-icon.png $out/share/icons/hicolor/128x128/apps/cura-icon.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=([56789].+)" ]; };
|
||||
|
||||
meta = {
|
||||
description = "3D printing software";
|
||||
homepage = "https://github.com/ultimaker/cura";
|
||||
changelog = "https://github.com/Ultimaker/Cura/releases/tag/${version}";
|
||||
longDescription = ''
|
||||
Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great.
|
||||
'';
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "cura";
|
||||
maintainers = with lib.maintainers; [
|
||||
pbek
|
||||
nh2
|
||||
fliegendewurst
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -18,16 +18,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "2.1.6";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = "deno";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tJskyj9jbtnrGQ48SUJadTM/ZVmCMbQ+YH/XXtMeyaQ=";
|
||||
hash = "sha256-FSip1EY6DCgmIgpkhzEF6h3yV8tJqZKnBpqgBDg1TKQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7hO2B0z4h1asWlAHdTNxo/dC8ZX/3XTrqMUft6Aads8=";
|
||||
cargoHash = "sha256-35XKqVBXlK6iPHec1ALhymYCD1GG1ZnCU2ET3PRGidk=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eza";
|
||||
version = "0.20.17";
|
||||
version = "0.20.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-X3/qW8BFa6Muk4XzTO6z6SDP07NHh7MOkngHNgw/sUA=";
|
||||
hash = "sha256-XJ8RYfBduTK5CkvFjVRF6yGkgBdojuewFUrEvRcTJsA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-q48LhGwi6WnzV2JLYhwbr7GtHNH6kMglntZK+sFf5zo=";
|
||||
cargoHash = "sha256-FUd2dtSwZEBJDCs5EbgrtHfO2oquZP/4wxhVreCaayg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "goxel";
|
||||
version = "0.15.1";
|
||||
version = "0.15.1-unstable-2024-12-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guillaumechereau";
|
||||
repo = "goxel";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-mNSkQisWL3wXb+IsClWFTMbpeiRC4xteePXNP+GkUnU=";
|
||||
rev = "60ec064a144295b17dfece85bb778dad19eaa8dc";
|
||||
hash = "sha256-H5ErFfYsGmU2KsWJyUoozlrpf/JhgFimMxyFHt+czdg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
cmake,
|
||||
@@ -21,24 +20,15 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpicker" + lib.optionalString debug "-debug";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprpicker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gu26MSYbTlRLMUpZ9PeYXtqqhzPDQXxEDkjiJgwzIIc=";
|
||||
hash = "sha256-CWmzXhsdk+c1d7Ub7TXQ2BVYla1HSJ9jbgOilbVl1so=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# FIXME: remove in next release
|
||||
(fetchpatch2 {
|
||||
name = "fix-hypr-wayland-scanner-0.4.4-build.patch";
|
||||
url = "https://github.com/hyprwm/hyprpicker/commit/444c40e5e3dc4058a6a762ba5e73ada6d6469055.patch?full_index=1";
|
||||
hash = "sha256-tg+oCUHtQkOXDrUY1w1x8zWWO1v4YV8ZxQKuSWuX/AI=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeBuildType = if debug then "Debug" else "Release";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubebuilder";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kubebuilder";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IZflevmuYJJyfL6DG8JnRRzV8imVUiH/cmPDqfpYzXM=";
|
||||
hash = "sha256-OLObVesASAOJxWXVJ5izJ8g6r7LCr1Or4JX2cF2RaVc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uoJjJ2wP8O7mLVj3MMe/pmTes3HmgD6v5M63ZhZSj78=";
|
||||
vendorHash = "sha256-xZF4t5SMe3iKH+Hr1xhVHWiwTpxEJ3kWlR0QB4RSNhk=";
|
||||
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "latex2html";
|
||||
version = "2024.2";
|
||||
version = "2025";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4g6bX6aVPOzSHTOB9wsfIiqS0SWygFtfeUDHT13FutA=";
|
||||
sha256 = "sha256-xylIU2GY/1t9mA8zJzEjHwAIlvVxZmUAUdQ/IXEy+Wg=";
|
||||
};
|
||||
|
||||
buildInputs = [ ghostscript netpbm perl ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metals";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps-${version}";
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-bvdLEHJgtLAu7C/jLMpcmFOVqASPNbiyN3q4qtYL3ls=";
|
||||
outputHash = "sha256-JRuQ5R4EVDP2wVez3FnD4Vx8h200ShiXRhyRtKhs8V4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neo4j";
|
||||
version = "5.26.0";
|
||||
version = "5.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
|
||||
hash = "sha256-rYrDOYYGFFUCuPSJUwu9OTM3B65GaBVq8WtghrWwN9c=";
|
||||
hash = "sha256-RiCUpsUxUaMSz1a4ptNQ8rp99ffj0r4DPggt8RgSj7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
{
|
||||
alsa-lib,
|
||||
autoPatchelfHook,
|
||||
cargo,
|
||||
dbus,
|
||||
fetchFromGitHub,
|
||||
gamescope,
|
||||
godot_4,
|
||||
godot_4-export-templates,
|
||||
hwdata,
|
||||
lib,
|
||||
libGL,
|
||||
libpulseaudio,
|
||||
mesa-demos,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
udev,
|
||||
upower,
|
||||
vulkan-loader,
|
||||
xorg,
|
||||
withDebug ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opengamepadui";
|
||||
version = "0.35.7";
|
||||
|
||||
buildType = if withDebug then "debug" else "release";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "OpenGamepadUI";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yOFxtDDYdxCtN8L8RtXgxebjRwK1Blsp/RG1E+UfUEI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "source/${finalAttrs.cargoRoot}";
|
||||
hash = "sha256-sTzMewIfKHbmVhSPZgUIzFFz1ahK+PMoQ5oB4GEt8nY=";
|
||||
};
|
||||
cargoRoot = "extensions";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
cargo
|
||||
godot_4
|
||||
godot_4-export-templates
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
alsa-lib
|
||||
dbus
|
||||
gamescope
|
||||
hwdata
|
||||
libGL
|
||||
libpulseaudio
|
||||
mesa-demos
|
||||
udev
|
||||
upower
|
||||
vulkan-loader
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXext
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXres
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
dontStrip = withDebug;
|
||||
|
||||
env =
|
||||
let
|
||||
versionAndRelease = lib.splitString "-" godot_4.version;
|
||||
in
|
||||
{
|
||||
GODOT = lib.getExe godot_4;
|
||||
GODOT_VERSION = lib.elemAt versionAndRelease 0;
|
||||
GODOT_RELEASE = lib.elemAt versionAndRelease 1;
|
||||
EXPORT_TEMPLATE = "${godot_4-export-templates}";
|
||||
BUILD_TYPE = "${finalAttrs.buildType}";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
buildFlags = [ "build" ];
|
||||
|
||||
preBuild = ''
|
||||
# Godot looks for export templates in HOME
|
||||
export HOME=$(mktemp -d)
|
||||
mkdir -p $HOME/.local/share/godot/export_templates
|
||||
ln -s "${godot_4-export-templates}" "$HOME/.local/share/godot/export_templates/$GODOT_VERSION.$GODOT_RELEASE"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# The Godot binary looks in "../lib" for gdextensions
|
||||
mkdir -p $out/share/lib
|
||||
mv $out/share/opengamepadui/*.so $out/share/lib
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Open source gamepad-native game launcher and overlay";
|
||||
homepage = "https://github.com/ShadowBlip/OpenGamepadUI";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
changelog = "https://github.com/ShadowBlip/OpenGamepadUI/releases/tag/v${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ shadowapex ];
|
||||
mainProgram = "opengamepadui";
|
||||
};
|
||||
})
|
||||
@@ -6,6 +6,7 @@
|
||||
readline,
|
||||
ncurses,
|
||||
zlib,
|
||||
bash,
|
||||
dataDir ? "/var/lib/softether",
|
||||
}:
|
||||
|
||||
@@ -25,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
readline
|
||||
ncurses
|
||||
zlib
|
||||
bash
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
@@ -41,6 +43,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
Makefile
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/bin/vpnbridge --replace-fail /var/lib/softether/vpnbridge/vpnbridge $out/var/lib/softether/vpnbridge/vpnbridge
|
||||
substituteInPlace $out/bin/vpnclient --replace-fail /var/lib/softether/vpnclient/vpnclient $out/var/lib/softether/vpnclient/vpnclient
|
||||
substituteInPlace $out/bin/vpncmd --replace-fail /var/lib/softether/vpncmd/vpncmd $out/var/lib/softether/vpncmd/vpncmd
|
||||
substituteInPlace $out/bin/vpnserver --replace-fail /var/lib/softether/vpnserver/vpnserver $out/var/lib/softether/vpnserver/vpnserver
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-incompatible-pointer-types"
|
||||
"-Wno-implicit-function-declaration"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Open-Source Free Cross-platform Multi-protocol VPN Program";
|
||||
homepage = "https://www.softether.org/";
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sql-formatter";
|
||||
version = "15.4.3";
|
||||
version = "15.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sql-formatter-org";
|
||||
repo = "sql-formatter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FMzNf++PXV136yetXlYJIXkP/i2iWLrcmar5/6NrXJk=";
|
||||
hash = "sha256-rCM/RDyWGBAobsiODIujkcjkqM4uSFPdRfvPqgIJQaY=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-R3PDDWxNtPK18adtHB4Jjp451Mp2p+5Fw6A1xkC58oY=";
|
||||
hash = "sha256-w+riBFsxqQ3BY2MF5yih1www+TMChneuTOS+sKWmlus=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tex-fmt";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WGUNDERWOOD";
|
||||
repo = "tex-fmt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LeoV500tnvnvl869NXi4b4LpBvX1FclYJzYAcC0QVRo=";
|
||||
hash = "sha256-3kRtBfIT6QcdZ1+h2WwvxsAv/UJLtwSodF5zvCUDbHQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jjBPGrdCJ3zk/kuIImEXkZTI5+492yekt5+iNyYhHGM=";
|
||||
cargoHash = "sha256-A8bRimM8eHUM86HLzReo4WFzaz6P9hnKuyhg0h0db9I=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -2,20 +2,20 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "typescript";
|
||||
version = "5.7.2";
|
||||
version = "5.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "TypeScript";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T74n9lDC6Yt40hwL0BhRjo5q3M3gROY8tQJcuRWWoBQ=";
|
||||
hash = "sha256-Lm7p27DgRWKY+auH6LIz8SIUfvPyQpel0xvkXgzlCzU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./disable-dprint-dstBundler.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-uaNRgXPZCNpPmZISAS6m4WLYPFTrsJ/w+YfQsQfxTVM=";
|
||||
npmDepsHash = "sha256-4w2CzEMrbfiSveTc/IH6O1twG9vkBkOxAIxJ8swXgNU=";
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
|
||||
@@ -95,7 +95,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zed-editor";
|
||||
version = "0.169.3";
|
||||
version = "0.170.1";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
|
||||
|
||||
@@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-F7R3GDjz5I82CqupVcTvhR+wvANAcxjIDDJ8azVTtfY=";
|
||||
hash = "sha256-prRBByJGzwwLowFX9P/k1QvjMvYk8yrvkSToK1RYJPQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-yuf2NNnclaMKXJnbg+SC7xqcgkf4JT36GqWXNBNZUCI=";
|
||||
cargoHash = "sha256-40Pif9JYN9uKqXTmaTMriYEvZ7DkcbNCif5h7YdiceY=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
|
||||
rec {
|
||||
pname = "mesa";
|
||||
version = "24.3.3";
|
||||
version = "24.3.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "mesa";
|
||||
repo = "mesa";
|
||||
rev = "mesa-${version}";
|
||||
hash = "sha256-OThJ/txyJ6p879jG5qOXX6mL27t7Uz/tbr620iRMeIc=";
|
||||
hash = "sha256-1RUHbTgcCxdDrWjqB0EG4Ny/nwdjQHHpyPauiW/yogU=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -15,9 +15,17 @@
|
||||
let
|
||||
common = import ./common.nix { inherit lib fetchFromGitLab; };
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mesa-libgbm";
|
||||
inherit (common) version src meta;
|
||||
version = "24.3.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "mesa";
|
||||
repo = "mesa";
|
||||
rev = "mesa-${version}";
|
||||
hash = "sha256-OThJ/txyJ6p879jG5qOXX6mL27t7Uz/tbr620iRMeIc=";
|
||||
};
|
||||
|
||||
mesonAutoFeatures = "disabled";
|
||||
|
||||
@@ -52,4 +60,6 @@ stdenv.mkDerivation {
|
||||
python3Packages.mako
|
||||
python3Packages.pyyaml
|
||||
];
|
||||
|
||||
inherit (common) meta;
|
||||
}
|
||||
|
||||
@@ -250,14 +250,14 @@ buildLuarocksPackage {
|
||||
commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "commons.nvim";
|
||||
version = "21.1.0-1";
|
||||
version = "26.0.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/commons.nvim-21.1.0-1.rockspec";
|
||||
sha256 = "00gq8ca65s01ay5c577dqbrya1vkqanf147wi25z6k1jlan33la1";
|
||||
url = "mirror://luarocks/commons.nvim-26.0.0-1.rockspec";
|
||||
sha256 = "1syrpqc4ydnrq7ly8lws4i3fs9cp5c9la8g1ppzixjqpdinymcgh";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/linrongbin16/commons.nvim/archive/ff4a221ac0007f9a47c2f5479a5e6180cc743ed1.zip";
|
||||
sha256 = "1f7964rdmzsp3a7av4in7biki32l5mv4y3jahjpr7sxh10ly6slh";
|
||||
url = "https://github.com/linrongbin16/commons.nvim/archive/84bd05cbdde7363541129c92ab60457ad45e63c9.zip";
|
||||
sha256 = "05a9a93kl88l68079kzmb40ahhzjf19424mrw69vq3bdhyjicjls";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -579,14 +579,14 @@ buildLuarocksPackage {
|
||||
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "fzf-lua";
|
||||
version = "0.0.1635-1";
|
||||
version = "0.0.1677-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/fzf-lua-0.0.1635-1.rockspec";
|
||||
sha256 = "0d7kvdxs923qhmrfh7zcnsxqnfd5fzzi2mlgpvskb6pjg5qnshar";
|
||||
url = "mirror://luarocks/fzf-lua-0.0.1677-1.rockspec";
|
||||
sha256 = "1vci1cv3rpxihn47ziiwash0wjfdrdblh3f592hjs8hasjf0syn7";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/af6ecbd7f421e7894127a9e94b40e13172fbfb13.zip";
|
||||
sha256 = "0zvbid4553sag41l5zx3j331nq17p1k6n2gbs7ynkbbd530qvsmf";
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/c23f777b28da6aa5603cde1b713e9f6973805d5d.zip";
|
||||
sha256 = "0icvaaa1nh7i6ri896azravq0hawsr2lnpcf6wlc1xkykk19cds8";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -630,8 +630,8 @@ buildLuarocksPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "68114837e81ca16d06514c3a997c9102d1b25c15";
|
||||
hash = "sha256-NmqXgzGp+y/WWrMxXKuQFIsKS3kYxKyAA6Qa5SGvqIw=";
|
||||
rev = "632fda72df903255dc1683cd739dceaa7338128a";
|
||||
hash = "sha256-Htx06FTru66DPFJUZEe6AaKqVtrD65MMqcerjjEZMR4=";
|
||||
};
|
||||
|
||||
disabled = lua.luaversion != "5.1";
|
||||
@@ -2732,8 +2732,8 @@ buildLuarocksPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "leafo";
|
||||
repo = "moonscript";
|
||||
rev = "3db3ec8234a1d77ad6f1fd773057efddfdc79a77";
|
||||
hash = "sha256-TPThwd8kce4hZY4orWnwqWTpQhS8Bn18fTLeURdT2AE=";
|
||||
rev = "98448bdcb219d6df081e7986200784b83ccd10f3";
|
||||
hash = "sha256-3HxJoP78PmK3s64AfB1VQNjhvraMFwZHg6gSWYKGZjo=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -2887,14 +2887,14 @@ buildLuarocksPackage {
|
||||
nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "nvim-nio";
|
||||
version = "1.10.0-1";
|
||||
version = "1.10.1-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/nvim-nio-1.10.0-1.rockspec";
|
||||
sha256 = "1dkspn96vvk38l809c7bl2gnjxkj8yj4aj6s5859pz4pxvxzs8p6";
|
||||
url = "mirror://luarocks/nvim-nio-1.10.1-1.rockspec";
|
||||
sha256 = "1bkxvhk5bml6q5g4ycv3ggrqd24kkhhswa6if5g2q6j1j44lxgj0";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-neotest/nvim-nio/archive/a428f309119086dc78dd4b19306d2d67be884eee.zip";
|
||||
sha256 = "0n40q6znpy1xzywd1hwyivx7y1n0i0fcp3m7jp0vgipm6qssda4b";
|
||||
url = "https://github.com/nvim-neotest/nvim-nio/archive/21f5324bfac14e22ba26553caf69ec76ae8a7662.zip";
|
||||
sha256 = "1bz5msxwk232zkkhfxcmr7a665la8pgkdx70q99ihl4x04jg6dkq";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3009,8 +3009,8 @@ buildLuarocksPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lua";
|
||||
repo = "plenary.nvim";
|
||||
rev = "2d9b06177a975543726ce5c73fca176cedbffe9d";
|
||||
hash = "sha256-bmmPekAvuBvLQmrnnX0n+FRBqfVxBsObhxIEkDGAla4=";
|
||||
rev = "3707cdb1e43f5cea73afb6037e6494e7ce847a66";
|
||||
hash = "sha256-18zX3kZ42ynRefFP0mOcy6ESEpejTukjNi4jCRXx48A=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1" || luaAtLeast "5.4";
|
||||
@@ -3477,16 +3477,16 @@ buildLuarocksPackage {
|
||||
tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchFromGitHub, fetchurl }:
|
||||
buildLuarocksPackage {
|
||||
pname = "tl";
|
||||
version = "0.24.1-1";
|
||||
version = "0.24.3-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/tl-0.24.1-1.rockspec";
|
||||
sha256 = "0r9cp5w824mmn3hmcwjcga182sa25hyvnkk81025hn49jfgr2hps";
|
||||
url = "mirror://luarocks/tl-0.24.3-1.rockspec";
|
||||
sha256 = "0h7alyda63zdjnivf43rkx73yz4zq4mhg4xn8gqirbi3yjwdkbrw";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "teal-language";
|
||||
repo = "tl";
|
||||
rev = "v0.24.1";
|
||||
hash = "sha256-7jnkURfY2o/32V5sEYleBfwWjDIeo2q/gGrFIizoHZk=";
|
||||
rev = "v0.24.3";
|
||||
hash = "sha256-3idtBSQ3D1T+4Z7MXlYh81Pn5rAhYodf+PAzFdFRT64=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ argparse compat53 ];
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
in
|
||||
buildPecl rec {
|
||||
inherit version;
|
||||
@@ -15,7 +15,7 @@ buildPecl rec {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-php-instrumentation";
|
||||
rev = version;
|
||||
hash = "sha256-/6Sr3gLzAVzzqF3fkxI4LMDAfA4tu5DiIgdVrfHSA3w=";
|
||||
hash = "sha256-frFnL49tF74cDKdlTJorOOrs8rNgFMZdMdVmqsyO3cI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/ext";
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.36.2";
|
||||
version = "1.36.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-9AHlhcx99N37PgL7lcXs+G59QVYcPvuAK6RgjhrUtmA=";
|
||||
hash = "sha256-9KCsaCAuaZSG9/tyg5he3RcJMAYzuin+tMec5IjOWf4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.36.2";
|
||||
version = "1.36.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-yWCewYS9RFEhq1UpZCv3c9Qgzcckfy0HqAghr+mj9nA=";
|
||||
hash = "sha256-MENwcLod9vBUmx3tcjrKdNBoUGEMffAC1kPgqp9MRSA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -166,8 +166,8 @@ rec {
|
||||
"sha256-mvC8pHHoNIK8xgiwGuoRcYsr1UkP57ZwQtuvRfYazk8=";
|
||||
|
||||
mypy-boto3-batch =
|
||||
buildMypyBoto3Package "batch" "1.36.0"
|
||||
"sha256-xXgkkAmQUunyMexJHVMX9W2aqSXyE4BmN0w+4FKbM/Y=";
|
||||
buildMypyBoto3Package "batch" "1.36.3"
|
||||
"sha256-LGhvJhNkuXjvJ99QYgrFSzbaUZRh0ROui5JvL7OYTeo=";
|
||||
|
||||
mypy-boto3-billingconductor =
|
||||
buildMypyBoto3Package "billingconductor" "1.36.0"
|
||||
@@ -314,8 +314,8 @@ rec {
|
||||
"sha256-nO1+08anNtpqBSO8zIQs1p8bDAWYhFMp/bexSWWgBaE=";
|
||||
|
||||
mypy-boto3-cognito-idp =
|
||||
buildMypyBoto3Package "cognito-idp" "1.36.0"
|
||||
"sha256-JgXToO2kEp5BHErZjIRBlDX7CCzlU6qurecwSW2ycG0=";
|
||||
buildMypyBoto3Package "cognito-idp" "1.36.3"
|
||||
"sha256-MEk24PAeivKmBAmagBJvmOEvoBDUiCjlN7bLqjH3Yqc=";
|
||||
|
||||
mypy-boto3-cognito-sync =
|
||||
buildMypyBoto3Package "cognito-sync" "1.36.0"
|
||||
@@ -338,8 +338,8 @@ rec {
|
||||
"sha256-VK7/vxmSeMHYNow/ifwEYB8w/35PQfUiMhinyKNlDJ8=";
|
||||
|
||||
mypy-boto3-connect =
|
||||
buildMypyBoto3Package "connect" "1.36.0"
|
||||
"sha256-Eo3LaVs+MjBJyjKrn5DStX0Gy1n/rnAejCuL1rc5xn0=";
|
||||
buildMypyBoto3Package "connect" "1.36.3"
|
||||
"sha256-thT1nWwkUSsmhLQOyV5QiR17jGHvkxbxcwMGwV5gFXE=";
|
||||
|
||||
mypy-boto3-connect-contact-lens =
|
||||
buildMypyBoto3Package "connect-contact-lens" "1.36.0"
|
||||
@@ -506,8 +506,8 @@ rec {
|
||||
"sha256-2YTbWlv98Ldoj7w/MDcKNH40V88NjSYN+CwnZugufE4=";
|
||||
|
||||
mypy-boto3-emr-serverless =
|
||||
buildMypyBoto3Package "emr-serverless" "1.36.0"
|
||||
"sha256-z2cvFzYgx+9ud+ZbWi+Dr2HMJJcPaaSOghFw7CDzj8w=";
|
||||
buildMypyBoto3Package "emr-serverless" "1.36.3"
|
||||
"sha256-K3BC9tO+z2BUGPs6SaMZKAmU4wkP5aKcJIjiIL5uDx8=";
|
||||
|
||||
mypy-boto3-entityresolution =
|
||||
buildMypyBoto3Package "entityresolution" "1.36.0"
|
||||
@@ -682,8 +682,8 @@ rec {
|
||||
"sha256-CZyyJNJDkz/rtwuQib7522Irs123wRAIFop37FfmGRw=";
|
||||
|
||||
mypy-boto3-iotsitewise =
|
||||
buildMypyBoto3Package "iotsitewise" "1.36.0"
|
||||
"sha256-VLRYSXse89aCgRjMr2t8ndDLnS60Bl+i8WLBe9fSoM8=";
|
||||
buildMypyBoto3Package "iotsitewise" "1.36.3"
|
||||
"sha256-ng93EV/PD82KyNEbY8EvGwi9R3beG8qjrbKH0bAeT40=";
|
||||
|
||||
mypy-boto3-iotthingsgraph =
|
||||
buildMypyBoto3Package "iotthingsgraph" "1.36.0"
|
||||
@@ -810,8 +810,8 @@ rec {
|
||||
"sha256-o9JdUCLxWhgzAmsv89/5FSVBDeNQMrk55mWYrqA7r58=";
|
||||
|
||||
mypy-boto3-logs =
|
||||
buildMypyBoto3Package "logs" "1.36.0"
|
||||
"sha256-oQzE1Gkn3xJBho8KT/9j1/1dLQQ0lmPtnXeQuMnbubw=";
|
||||
buildMypyBoto3Package "logs" "1.36.3"
|
||||
"sha256-dtIzYyo2ZlCUrIiKaF+t4VDBBmWrTK0bFyZQN/yt0Jg=";
|
||||
|
||||
mypy-boto3-lookoutequipment =
|
||||
buildMypyBoto3Package "lookoutequipment" "1.36.0"
|
||||
@@ -1074,8 +1074,8 @@ rec {
|
||||
"sha256-IIhC16TF+6AWHq0phnsTfxAdw/DuZ+5piLJROLBcAlw=";
|
||||
|
||||
mypy-boto3-quicksight =
|
||||
buildMypyBoto3Package "quicksight" "1.36.0"
|
||||
"sha256-rqWSXNzdaKg4IUwgMAE9GGYzIH8ui6waRTYPcH7UFcA=";
|
||||
buildMypyBoto3Package "quicksight" "1.36.3"
|
||||
"sha256-q3F2VE4EI7qTCCuYMb6ZUYrU7hYUfbnNjSHw2jqHqk4=";
|
||||
|
||||
mypy-boto3-ram =
|
||||
buildMypyBoto3Package "ram" "1.36.0"
|
||||
@@ -1286,8 +1286,8 @@ rec {
|
||||
"sha256-7bTjFV56sVY9Vcl8pnU+Eajx6hkK50u9eq0ot4suLT4=";
|
||||
|
||||
mypy-boto3-sns =
|
||||
buildMypyBoto3Package "sns" "1.36.0"
|
||||
"sha256-6MYsLAiVgCdWb2QcPzvHcsUDiMTcEgpc3fUQkhap+lo=";
|
||||
buildMypyBoto3Package "sns" "1.36.3"
|
||||
"sha256-1SH0X0eIpMEdFxXf5sKvhX65T3ZksZdTo8ZW+xG6+m8=";
|
||||
|
||||
mypy-boto3-sqs =
|
||||
buildMypyBoto3Package "sqs" "1.36.0"
|
||||
|
||||
+3
-3
@@ -6,18 +6,18 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "universal-remote-card";
|
||||
version = "4.3.5";
|
||||
version = "4.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nerwyn";
|
||||
repo = "android-tv-card";
|
||||
rev = version;
|
||||
hash = "sha256-xc0xgCj+m9+xslAgnbZxeD7KEFgTK9WdaMjOhhWopFs=";
|
||||
hash = "sha256-UIQZT1fzZvBHpFRsj508F2pyCQAt0vLMSj1H5qwRBXc=";
|
||||
};
|
||||
|
||||
patches = [ ./dont-call-git.patch ];
|
||||
|
||||
npmDepsHash = "sha256-qw8EignkEJIt85UJPLu2zuno95d3oSGnCujX7vgns/M=";
|
||||
npmDepsHash = "sha256-BV00u+/OvC3dmz7BvqygSUuwf+jsfuKNZDOO6d5nATk=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -60,13 +60,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hw-probe";
|
||||
version = "1.6.5";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxhw";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WlLSgjVLqGGtwCyyUn9X3XbE2Yhz6LD245+U2JgGd+k=";
|
||||
sha256 = "sha256-8dLfk2k7xG2CXMHfMPrpgq43j3ttj5a0bgNPEahl2rQ=";
|
||||
};
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
Reference in New Issue
Block a user