Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
commit
bbe2061815
@ -2,20 +2,22 @@
|
|||||||
lib,
|
lib,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
crystal,
|
crystal,
|
||||||
|
coreutils,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
crystal.buildCrystalPackage rec {
|
crystal.buildCrystalPackage rec {
|
||||||
pname = "ameba";
|
pname = "ameba";
|
||||||
version = "1.6.1";
|
version = "1.6.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "crystal-ameba";
|
owner = "crystal-ameba";
|
||||||
repo = "ameba";
|
repo = "ameba";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-NwmsNz9YfHDk0hVwVb5zczuzvErrwPhd3rs75t/Fj+I=";
|
hash = "sha256-2gEwgXjB6zcJQAdUGQfZFe8WcqT5fyb8Qbxk0qwn+c8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
format = "make";
|
format = "make";
|
||||||
|
installFlags = [ "INSTALL_BIN=${coreutils}/bin/install" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Static code analysis tool for Crystal";
|
description = "Static code analysis tool for Crystal";
|
||||||
|
@ -13,17 +13,17 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "gitu";
|
pname = "gitu";
|
||||||
version = "0.27.0";
|
version = "0.28.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "altsem";
|
owner = "altsem";
|
||||||
repo = "gitu";
|
repo = "gitu";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-/g+hjQQhu771yqLhx4THaNCJKShXB7RoxiS9bQDUijU=";
|
hash = "sha256-eG3ORk4nD8htdZpboEgcR4P94aKUX7eDHo6uTfSw2Zo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-e9LaVNpApHAShkqt2TawRLWVQ7IoE9hoXlMyMRmpeCY=";
|
cargoHash = "sha256-HiP4fE3rU8j7DZ+qNkrtohXgrljN0PPlg6aYj575L3Q=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -89,6 +89,15 @@ let
|
|||||||
export LIBVA_DRIVERS_PATH=/run/opengl-driver/lib/dri:/run/opengl-driver-32/lib/dri
|
export LIBVA_DRIVERS_PATH=/run/opengl-driver/lib/dri:/run/opengl-driver-32/lib/dri
|
||||||
export VDPAU_DRIVER_PATH=/run/opengl-driver/lib/vdpau:/run/opengl-driver-32/lib/vdpau
|
export VDPAU_DRIVER_PATH=/run/opengl-driver/lib/vdpau:/run/opengl-driver-32/lib/vdpau
|
||||||
|
|
||||||
|
# Steam gets confused by the symlinks to bind mounts to symlinks /etc/localtime ends up being, so help it out.
|
||||||
|
# See also: https://github.com/flathub/com.valvesoftware.Steam/blob/28481f09f33c12b6ac7421d13af9ed1523c54ec4/steam_wrapper/steam_wrapper.py#L160
|
||||||
|
if [ -z ''${TZ+x} ]; then
|
||||||
|
new_TZ="$(readlink -f /etc/localtime | grep -P -o '(?<=/zoneinfo/).*$')"
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
export TZ="$new_TZ"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
set -a
|
set -a
|
||||||
${lib.toShellVars extraEnv}
|
${lib.toShellVars extraEnv}
|
||||||
set +a
|
set +a
|
||||||
|
@ -6,15 +6,15 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "svdtools";
|
pname = "svdtools";
|
||||||
version = "0.4.0";
|
version = "0.4.3";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit version pname;
|
inherit version pname;
|
||||||
hash = "sha256-cZLLpFYjKIF4bhZJWXFUpTSKSUOWkLZ0DTQ0PpZnPIg=";
|
hash = "sha256-ftT9EgICfy8vnb6XWEUUtX351+f5aex8xaY11nnWcAY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
useFetchCargoVendor = true;
|
useFetchCargoVendor = true;
|
||||||
cargoHash = "sha256-UEXFkiz4brOXGDa0Ffea712Ng5E8t/yBm4H8y7Lz9Mc=";
|
cargoHash = "sha256-aNdEvmHnc0LqcjIJbh8gi3SfHnFPnlkO5CwO38ezfr8=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Tools to handle vendor-supplied, often buggy SVD files";
|
description = "Tools to handle vendor-supplied, often buggy SVD files";
|
||||||
|
@ -7,14 +7,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "knx-frontend";
|
pname = "knx-frontend";
|
||||||
version = "2025.1.18.164225";
|
version = "2025.1.30.194235";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
# TODO: source build, uses yarn.lock
|
# TODO: source build, uses yarn.lock
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "knx_frontend";
|
pname = "knx_frontend";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-Q1y6hhOP+92BSo7FAJ01EarN57iuknqLQQhH7frhPn8=";
|
hash = "sha256-P3KUpmltw7xX/6xq9RMFlP8UMDp2/ynvVCkK3rvwzk0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user