gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
K900
2024-12-19 21:09:21 +03:00
parent 64254c379b cd47d5624e
commit fc37c2ff33
99 changed files with 8085 additions and 4390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+12
View File
@@ -17079,6 +17079,12 @@
githubId = 1788628;
name = "pandaman";
};
pandanz = {
email = "gate.rules-5j@icloud.com";
github = "pandanz";
githubId = 32557789;
name = "pandanz";
};
pandapip1 = {
email = "gavinnjohn@gmail.com";
github = "Pandapip1";
@@ -22414,6 +22420,12 @@
githubId = 3105057;
name = "Jan Beinke";
};
thelissimus = {
name = "Kei";
email = "thelissimus@tuta.io";
github = "thelissimus";
githubId = 70096720;
};
themaxmur = {
name = "Maxim Muravev";
email = "muravjev.mak@yandex.ru";
nixos/doc/manual/release-notes/rl-2505.section.md
+2
View File
@@ -107,6 +107,8 @@
- `nodePackages.copy-webpack-plugin` has been removed, as it should be installed in projects that use it instead.
- `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives.
- `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead.
- `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`.
nixos/modules/hardware/video/nvidia.nix
+35 -25
View File
@@ -92,21 +92,23 @@ in
information, see the NVIDIA docs, on Chapter 23. Dynamic Boost on Linux
'';
modesetting.enable = lib.mkEnableOption ''
kernel modesetting when using the NVIDIA proprietary driver.
modesetting.enable =
lib.mkEnableOption ''
kernel modesetting when using the NVIDIA proprietary driver.
Enabling this fixes screen tearing when using Optimus via PRIME (see
{option}`hardware.nvidia.prime.sync.enable`. This is not enabled
by default because it is not officially supported by NVIDIA and would not
work with SLI.
Enabling this fixes screen tearing when using Optimus via PRIME (see
{option}`hardware.nvidia.prime.sync.enable`. This is not enabled
by default because it is not officially supported by NVIDIA and would not
work with SLI.
Enabling this and using version 545 or newer of the proprietary NVIDIA
driver causes it to provide its own framebuffer device, which can cause
Wayland compositors to work when they otherwise wouldn't.
'' // {
default = lib.versionAtLeast cfg.package.version "535";
defaultText = lib.literalExpression "lib.versionAtLeast cfg.package.version \"535\"";
};
Enabling this and using version 545 or newer of the proprietary NVIDIA
driver causes it to provide its own framebuffer device, which can cause
Wayland compositors to work when they otherwise wouldn't.
''
// {
default = lib.versionAtLeast cfg.package.version "535";
defaultText = lib.literalExpression "lib.versionAtLeast cfg.package.version \"535\"";
};
prime.nvidiaBusId = lib.mkOption {
type = busIDType;
@@ -266,14 +268,16 @@ in
'';
};
gsp.enable = lib.mkEnableOption ''
the GPU System Processor (GSP) on the video card
'' // {
default = useOpenModules || lib.versionAtLeast nvidia_x11.version "555";
defaultText = lib.literalExpression ''
config.hardware.nvidia.open == true || lib.versionAtLeast config.hardware.nvidia.package.version "555"
'';
};
gsp.enable =
lib.mkEnableOption ''
the GPU System Processor (GSP) on the video card
''
// {
default = useOpenModules || lib.versionAtLeast nvidia_x11.version "555";
defaultText = lib.literalExpression ''
config.hardware.nvidia.open == true || lib.versionAtLeast config.hardware.nvidia.package.version "555"
'';
};
videoAcceleration =
(lib.mkEnableOption ''
@@ -300,7 +304,7 @@ in
message = "You cannot configure both X11 and Data Center drivers at the same time.";
}
{
assertion = cfg.open != null;
assertion = cfg.open != null || cfg.datacenter.enable;
message = ''
You must configure `hardware.nvidia.open` on NVIDIA driver versions >= 560.
It is suggested to use the open source kernel modules on Turing or later GPUs (RTX series, GTX 16xx), and the closed source modules otherwise.
@@ -323,7 +327,9 @@ in
softdep nvidia post: nvidia-uvm
'';
};
systemd.tmpfiles.rules = lib.mkIf config.virtualisation.docker.enableNvidia [ "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin" ];
systemd.tmpfiles.rules = lib.mkIf config.virtualisation.docker.enableNvidia [
"L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin"
];
services.udev.extraRules = ''
# Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'"
@@ -622,7 +628,9 @@ in
# If requested enable modesetting via kernel parameters.
kernelParams =
lib.optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"
++ lib.optional ((offloadCfg.enable || cfg.modesetting.enable) && lib.versionAtLeast nvidia_x11.version "545") "nvidia-drm.fbdev=1"
++ lib.optional (
(offloadCfg.enable || cfg.modesetting.enable) && lib.versionAtLeast nvidia_x11.version "545"
) "nvidia-drm.fbdev=1"
++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
++ lib.optional useOpenModules "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off";
@@ -683,7 +691,9 @@ in
TOPOLOGY_FILE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch";
DATABASE_PATH = "${nvidia_x11.fabricmanager}/share/nvidia-fabricmanager/nvidia/nvswitch";
};
nv-fab-conf = settingsFormat.generate "fabricmanager.conf" (fabricManagerConfDefaults // cfg.datacenter.settings);
nv-fab-conf = settingsFormat.generate "fabricmanager.conf" (
fabricManagerConfDefaults // cfg.datacenter.settings
);
in
"${lib.getExe nvidia_x11.fabricmanager} -c ${nv-fab-conf}";
LimitCORE = "infinity";
nixos/modules/services/misc/ollama.nix
+2
View File
@@ -224,6 +224,8 @@ in
# ROCm
"char-drm"
"char-kfd"
# WSL (Windows Subsystem for Linux)
"/dev/dxg"
];
DevicePolicy = "closed";
LockPersonality = true;
nixos/modules/services/monitoring/prometheus/exporters.nix
+1
View File
@@ -76,6 +76,7 @@ let
"process"
"pve"
"py-air-control"
"rasdaemon"
"redis"
"restic"
"rspamd"
nixos/modules/services/monitoring/prometheus/exporters/rasdaemon.nix
+67
View File
@@ -0,0 +1,67 @@
{
config,
lib,
pkgs,
utils,
...
}:
let
inherit (lib)
getExe
mkOption
types
;
inherit (utils) escapeSystemdExecArgs;
cfg = config.services.prometheus.exporters.rasdaemon;
in
{
port = 10029;
extraOpts = with types; {
databasePath = mkOption {
type = path;
default = "/var/lib/rasdaemon/ras-mc_event.db";
description = ''
Path to the RAS daemon machine check event database.
'';
};
enabledCollectors = mkOption {
type = listOf (enum [
"aer"
"mce"
"mc"
"extlog"
"devlink"
"disk"
]);
default = [
"aer"
"mce"
"mc"
];
description = ''
List of error types to collect from the event database.
'';
};
};
serviceOpts = {
serviceConfig = {
ExecStart = escapeSystemdExecArgs (
[
(getExe pkgs.prometheus-rasdaemon-exporter)
"--address"
cfg.listenAddress
"--port"
(toString cfg.port)
"--db"
cfg.databasePath
]
++ map (collector: "--collector-${collector}") cfg.enabledCollectors
++ cfg.extraFlags
);
};
};
}
pkgs/applications/blockchains/polkadot/Cargo.lock
Generated
+6620 -3338
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/blockchains/polkadot/default.nix
+14 -3
View File
@@ -18,13 +18,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "stable2409-2";
version = "2412";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot-sdk";
rev = "polkadot-${version}";
hash = "sha256-nCxnQ243afj9Bq8LMXEvn5ZGYw2SonfeJMd0OOi/GZ0=";
rev = "polkadot-stable${version}";
hash = "sha256-0oqSABuCcyNhvCJyZuesnPvsUgHdNXdc36HeNMmToYM=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@@ -48,7 +48,14 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"ark-secret-scalar-0.0.2" = "sha256-yvgTxccxeUrnBhElI7AY3ad0PqmGCDlsoi8jH2Cceks=";
"common-0.1.0" = "sha256-Jbl5b0zIDFBcu2lYi5LYRdABq3vxgPlE4EsFucTWQd8=";
"fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo=";
"ipfs-hasher-0.21.3" = "sha256-AH3NMil07F+kkWjqAbMaMbjnTisSQiCd3tJz934ZICw=";
"simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w=";
"sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8=";
"sp-crypto-ec-utils-0.4.1" = "sha256-KXyG43YIzMG2r6kCTyQyCIHSAkXSlZv8pbFEXXvC4JU=";
"sp-debug-derive-8.0.0" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI=";
};
};
@@ -57,6 +64,10 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [
"-p"
"polkadot"
"-p"
"polkadot-omni-node"
"-p"
"polkadot-parachain-bin"
];
# NOTE: tests currently fail to compile due to an issue with cargo-auditable
pkgs/applications/editors/sublime/4/packages.nix
+6 -6
View File
@@ -5,15 +5,15 @@ let
in
{
sublime4 = common {
buildVersion = "4180";
x64sha256 = "pl42AR4zWF3vx3wPSZkfIP7Oksune5nsbmciyJUv8D4=";
aarch64sha256 = "zRg2jfhi+g6iLrMF1TGAYT+QQKSNI1W4Yv1bz9oEXHg=";
buildVersion = "4186";
x64sha256 = "Rw/N2uSsMb6uMvMt9lEzBFSAvAePFTwfX09ARDX1mSs=";
aarch64sha256 = "6RKaSIDj0zOqjYAGb77q3+sKqmp+VFqcgODyU06ajrc=";
} { };
sublime4-dev = common {
buildVersion = "4178";
buildVersion = "4187";
dev = true;
x64sha256 = "2eTdb5MzXK3QbAEzl1yxURj4m/PqGHPVnHZV2WzD6Jc=";
aarch64sha256 = "NLLOB4WnujMx3+wf6Evi+yBWM6463EZoNL2wEdJA8BA=";
x64sha256 = "4Xcpnvplj3ik3kWtwJ6ZT//nRgMCw/ceN7bVuEDApDA=";
aarch64sha256 = "EreN+SjVnm1Kt+Oz72AQ86AKdgm9n72lv/JQvefb8YU=";
} { };
}
pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "helm-diff";
version = "3.9.12";
version = "3.9.13";
src = fetchFromGitHub {
owner = "databus23";
repo = pname;
rev = "v${version}";
hash = "sha256-fHL5YlqDS4taQNgqgYYttq/6Q5kQhp/hvtqMRCKPt70=";
hash = "sha256-676xMnedfGF3aVub78eQo2KYJgJLxKg9g3Nm6D9lYA0=";
};
vendorHash = "sha256-7amqt5FIgnDtaybyur3t01BuuQXPdFptDBfqhX6jPIE=";
vendorHash = "sha256-qfdxEXiNJlaJPzpwY4GY+mYZAxjkMJyZO8PgcqJCPos=";
ldflags = [
"-s"
pkgs/applications/networking/cluster/terraform-providers/providers.json
+14 -14
View File
@@ -81,13 +81,13 @@
"vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
},
"artifactory": {
"hash": "sha256-cpQ4FqrY7Y2eYAXdmcM5l/mo7XI2ksJtALgQAvj1cOM=",
"hash": "sha256-bb0W1NjcF8JbWw9VEYD9fnw9WN7fCwIQISg9QZQD3YY=",
"homepage": "https://registry.terraform.io/providers/jfrog/artifactory",
"owner": "jfrog",
"repo": "terraform-provider-artifactory",
"rev": "v12.5.1",
"rev": "v12.7.0",
"spdx": "Apache-2.0",
"vendorHash": "sha256-RtBEXTkmPPccNmbPLNAnF1L8kinL46uBLZVMqO3887I="
"vendorHash": "sha256-J+JBq8QybqIQp2j5EtZhpdGvDd84lwmzezcWl5pXxRs="
},
"auth0": {
"hash": "sha256-x4fi3huCQ82MBdy75+je6x4bj4yxyoaJM1GyQ29R1GA=",
@@ -606,11 +606,11 @@
"vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8="
},
"huaweicloud": {
"hash": "sha256-u9EU+PusAhnTEivOed+M5eQtXpcKXQprPoY4sFcDAsg=",
"hash": "sha256-WVoG8XoH1u0mnM4i/mULV+c6gGr3u6AVj5RiqOAlBmA=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.71.0",
"rev": "v1.71.2",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -804,13 +804,13 @@
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
},
"migadu": {
"hash": "sha256-0gHAuJ5xT2K9ndCUg3UzAfmpjQwHrrOAeF6zrRbyjSs=",
"hash": "sha256-Z9doPI2ARlwqeeFai3ysyDk2f2FHrZUewqcz6IzaMHo=",
"homepage": "https://registry.terraform.io/providers/metio/migadu",
"owner": "metio",
"repo": "terraform-provider-migadu",
"rev": "2024.11.28",
"rev": "2024.12.12",
"spdx": "0BSD",
"vendorHash": "sha256-PQAp8YeAopCt/W3w6esI6fLyTC7wtpWY6Jk8xPrjQWI="
"vendorHash": "sha256-Fc7ZoUtThsJd3rvn/j1gU4tpEj2ofg1pgCzQOYEdQFA="
},
"minio": {
"hash": "sha256-aSEzsncqNLWfVnnGfz/fDpRw9w2muGnybX8WYd1tP/Y=",
@@ -949,13 +949,13 @@
"vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI="
},
"opentelekomcloud": {
"hash": "sha256-qYBZHUZFpl9jJy/N3kRby322WQ3MWiKem9cdQrGfhR0=",
"hash": "sha256-H7IG6YjGSbPXaprWfGjQzHcaEIa9H6xUuoG4PPho/8s=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.36.26",
"rev": "v1.36.27",
"spdx": "MPL-2.0",
"vendorHash": "sha256-3qdC+Xb6epfN+kjkMlh4FApgQr59V/OFssw6Wek3gpE="
"vendorHash": "sha256-3dDj0I7kBkwbQun90VUqdvpUcelMz1v7/OfgXfb87yE="
},
"opsgenie": {
"hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",
@@ -1111,13 +1111,13 @@
"vendorHash": "sha256-JytWDb7d2RW/fp5rptAzmfTTuytZ+lp6cB05ol9mhhM="
},
"sentry": {
"hash": "sha256-nucGcVNotqXeHhymfeB/qhh7XCthX18BeoBF2is2dxk=",
"hash": "sha256-+Cmlkxr9wHHZ8wbohkxisqvf/JxpOBFAk/0MU+Xh0ho=",
"homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
"owner": "jianyuan",
"repo": "terraform-provider-sentry",
"rev": "v0.14.1",
"rev": "v0.14.2",
"spdx": "MIT",
"vendorHash": "sha256-ggeIvTGJjuUAa9RIP9FSAAkZDt57eMyteTSFht3qvNc="
"vendorHash": "sha256-RbUBHX0/nUihgiK6ibbkR/2DKJOdJt9VYyCJgWsj2zo="
},
"shell": {
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
pkgs/by-name/ae/aegisub/000-remove-bundled-luajit.patch
-271
View File
@@ -1,271 +0,0 @@
diff --git a/CMakeLists.test.txt b/CMakeLists.test.txt
index 4d1a03177..62fab05c9 100644
--- a/CMakeLists.test.txt
+++ b/CMakeLists.test.txt
@@ -2,7 +2,7 @@ if(UNIX)
add_executable(aegisub-lua EXCLUDE_FROM_ALL
automation/tests/aegisub.cpp
)
- target_link_libraries(aegisub-lua PRIVATE libaegisub luabins luajit "Boost::locale" "ICU::in")
+ target_link_libraries(aegisub-lua PRIVATE libaegisub luabins luajit-5.1 "Boost::locale" "ICU::in")
add_custom_target(test-automation
COMMAND sh -c "$(luarocks path); ${PROJECT_BINARY_DIR}/aegisub-lua tests/busted.lua -p moon tests/modules"
VERBATIM
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce2e355ff..4d4396451 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,210 +13,6 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
endif()
-## Build bundled LuaJIT with aegisub specific patches
-add_executable(luajit-minilua vendor/luajit/src/host/minilua.c)
-if(NOT WIN32)
- target_link_libraries(luajit-minilua m)
-endif()
-if(WIN32)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
- COMMAND luajit-minilua ../dynasm/dynasm.lua -LN -D WIN -D JIT -D FFI -D P64 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
- )
- else()
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
- COMMAND luajit-minilua ../dynasm/dynasm.lua -LN -D WIN -D JIT -D FFI -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
- )
- endif()
-elseif(APPLE)
- if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
- COMMAND luajit-minilua ../dynasm/dynasm.lua -D ENDIAN_LE -D P64 -D FFI -D DUALNUM -D FPU -D HFABI -D NO_UNWIND -D VER=80 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_arm64.dasc
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
- )
- else()
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
- COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x64.dasc
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
- )
- endif()
-else()
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
- COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
- )
- else()
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
- COMMAND luajit-minilua ../dynasm/dynasm.lua -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
- )
- endif()
-endif()
-
-add_executable(luajit-buildvm
- vendor/luajit/src/host/buildvm.c
- vendor/luajit/src/host/buildvm_asm.c
- vendor/luajit/src/host/buildvm_peobj.c
- vendor/luajit/src/host/buildvm_lib.c
- vendor/luajit/src/host/buildvm_fold.c
-
- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
-)
-target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_LUA52COMPAT)
-target_include_directories(luajit-buildvm PRIVATE vendor/luajit/src "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen")
-
-if(APPLE)
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
- COMMAND luajit-buildvm -m machasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
- )
-elseif(UNIX)
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
- COMMAND luajit-buildvm -m elfasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
- )
-elseif(MSVC)
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj"
- COMMAND luajit-buildvm -m peobj -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj"
- )
-endif()
-add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h"
- COMMAND luajit-buildvm -m ffdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
-)
-add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h"
- COMMAND luajit-buildvm -m bcdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
-)
-add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h"
- COMMAND luajit-buildvm -m folddef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h" lj_opt_fold.c
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
-)
-add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h"
- COMMAND luajit-buildvm -m recdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
-)
-add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h"
- COMMAND luajit-buildvm -m libdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
-)
-add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua"
- COMMAND luajit-buildvm -m vmdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
-)
-
-add_library(luajit STATIC
- vendor/luajit/src/lib_base.c
- vendor/luajit/src/lib_math.c
- vendor/luajit/src/lib_bit.c
- vendor/luajit/src/lib_string.c
- vendor/luajit/src/lib_table.c
- vendor/luajit/src/lib_io.c
- vendor/luajit/src/lib_os.c
- vendor/luajit/src/lib_package.c
- vendor/luajit/src/lib_debug.c
- vendor/luajit/src/lib_jit.c
- vendor/luajit/src/lib_ffi.c
- vendor/luajit/src/lj_gc.c
- vendor/luajit/src/lj_err.c
- vendor/luajit/src/lj_char.c
- vendor/luajit/src/lj_bc.c
- vendor/luajit/src/lj_obj.c
- vendor/luajit/src/lj_buf.c
- vendor/luajit/src/lj_str.c
- vendor/luajit/src/lj_tab.c
- vendor/luajit/src/lj_func.c
- vendor/luajit/src/lj_udata.c
- vendor/luajit/src/lj_meta.c
- vendor/luajit/src/lj_debug.c
- vendor/luajit/src/lj_state.c
- vendor/luajit/src/lj_dispatch.c
- vendor/luajit/src/lj_vmevent.c
- vendor/luajit/src/lj_vmmath.c
- vendor/luajit/src/lj_strscan.c
- vendor/luajit/src/lj_strfmt.c
- vendor/luajit/src/lj_strfmt_num.c
- vendor/luajit/src/lj_api.c
- vendor/luajit/src/lj_profile.c
- vendor/luajit/src/lj_lex.c
- vendor/luajit/src/lj_parse.c
- vendor/luajit/src/lj_bcread.c
- vendor/luajit/src/lj_bcwrite.c
- vendor/luajit/src/lj_load.c
- vendor/luajit/src/lj_ir.c
- vendor/luajit/src/lj_opt_mem.c
- vendor/luajit/src/lj_opt_fold.c
- vendor/luajit/src/lj_opt_narrow.c
- vendor/luajit/src/lj_opt_dce.c
- vendor/luajit/src/lj_opt_loop.c
- vendor/luajit/src/lj_opt_split.c
- vendor/luajit/src/lj_opt_sink.c
- vendor/luajit/src/lj_mcode.c
- vendor/luajit/src/lj_snap.c
- vendor/luajit/src/lj_record.c
- vendor/luajit/src/lj_crecord.c
- vendor/luajit/src/lj_ffrecord.c
- vendor/luajit/src/lj_asm.c
- vendor/luajit/src/lj_trace.c
- vendor/luajit/src/lj_gdbjit.c
- vendor/luajit/src/lj_ctype.c
- vendor/luajit/src/lj_cdata.c
- vendor/luajit/src/lj_cconv.c
- vendor/luajit/src/lj_ccall.c
- vendor/luajit/src/lj_ccallback.c
- vendor/luajit/src/lj_carith.c
- vendor/luajit/src/lj_clib.c
- vendor/luajit/src/lj_cparse.c
- vendor/luajit/src/lj_lib.c
- vendor/luajit/src/lj_alloc.c
- vendor/luajit/src/lib_aux.c
- vendor/luajit/src/lib_init.c
-
- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h"
- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h"
- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h"
- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h"
- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h"
- # "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua"
-)
-target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_LUA52COMPAT)
-target_include_directories(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" PUBLIC "vendor/luajit/src")
-if(WIN32)
- target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj")
-else()
- enable_language(ASM)
- target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s")
- target_link_libraries(luajit ${CMAKE_DL_LIBS})
-endif()
-if(APPLE)
- if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
- target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_GC64)
- target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_GC64)
- endif()
-endif()
-
add_subdirectory(vendor/luabins)
## libaegisub
@@ -310,18 +106,18 @@ if(APPLE)
else()
target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
endif()
-target_link_libraries(libaegisub PRIVATE luajit luabins)
+target_link_libraries(libaegisub PRIVATE luajit-5.1 luabins)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config.h"
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config_platform.json"
- COMMAND luajit-minilua "${PROJECT_SOURCE_DIR}/tools/respack.lua" manifest.respack default_config.cpp default_config.h
+ COMMAND luajit "${PROJECT_SOURCE_DIR}/tools/respack.lua" manifest.respack default_config.cpp default_config.h
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc"
)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h"
- COMMAND luajit-minilua ../../tools/respack.lua manifest.respack "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h"
+ COMMAND luajit ../../tools/respack.lua manifest.respack "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h"
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/bitmaps
)
@@ -496,7 +292,7 @@ add_executable(Aegisub WIN32
src/video_slider.cpp
src/visual_feature.cpp
)
-target_link_libraries(Aegisub PRIVATE ${CMAKE_DL_LIBS} libaegisub luajit)
+target_link_libraries(Aegisub PRIVATE ${CMAKE_DL_LIBS} libaegisub luajit-5.1)
target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD)
target_include_directories(Aegisub PRIVATE "src/libresrc" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc")
if(APPLE)
diff --git a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
index 1fe1d2031..e2761527b 100644
--- a/vendor/luabins/CMakeLists.txt
+++ b/vendor/luabins/CMakeLists.txt
@@ -36,4 +36,4 @@ add_library(luabins STATIC
src/savebuffer.c
src/write.c
)
-target_link_libraries(luabins PRIVATE luajit)
\ No newline at end of file
+target_link_libraries(luabins PRIVATE luajit-5.1)
\ No newline at end of file
pkgs/by-name/ae/aegisub/package.nix
+50 -64
View File
@@ -2,38 +2,32 @@
lib,
alsa-lib,
boost,
cmake,
curl,
meson,
config,
darwin,
expat,
fetchFromGitHub,
fetchpatch,
ffmpeg,
ffms,
fftw,
fontconfig,
freetype,
fribidi,
glib,
harfbuzz,
hunspell,
icu,
intltool,
libGL,
libGLU,
libX11,
libass,
libiconv,
libpulseaudio,
libuchardet,
luajit,
ninja,
openal,
pcre,
pkg-config,
portaudio,
python3,
stdenv,
which,
wrapGAppsHook3,
wxGTK,
zlib,
@@ -46,40 +40,30 @@
useBundledLuaJIT ? false,
}:
let
inherit (darwin.apple_sdk.frameworks)
AppKit
Carbon
Cocoa
CoreFoundation
CoreText
IOKit
OpenAL;
in
stdenv.mkDerivation (finalAttrs: {
pname = "aegisub";
version = "3.3.3";
version = "3.4.0";
src = fetchFromGitHub {
owner = "wangqr";
owner = "TypesettingTools";
repo = "aegisub";
rev = "v${finalAttrs.version}";
hash = "sha256-oKhLv81EFudrJaaJ2ga3pVh4W5Hd2YchpjsoYoqRm78=";
tag = "v${finalAttrs.version}";
hash = "sha256-HvBbHUWKUFpne7Dj8CB2V9agBSBbB24BXnnYWUjHSDI=";
};
nativeBuildInputs = [
cmake
meson
intltool
luajit
ninja
pkg-config
which
wrapGAppsHook3
python3
wxGTK
wrapGAppsHook3
];
buildInputs = [
boost
curl
expat
ffmpeg
ffms
@@ -87,33 +71,34 @@ stdenv.mkDerivation (finalAttrs: {
fontconfig
freetype
fribidi
glib
harfbuzz
icu
libGL
libGLU
libX11
libass
libiconv
libuchardet
pcre
wxGTK
zlib
]
++ lib.optionals alsaSupport [ alsa-lib ]
++ lib.optionals openalSupport [
(if stdenv.hostPlatform.isDarwin then OpenAL else openal)
]
++ lib.optionals (openalSupport && !stdenv.hostPlatform.isDarwin) [ openal ]
++ lib.optionals portaudioSupport [ portaudio ]
++ lib.optionals pulseaudioSupport [ libpulseaudio ]
++ lib.optionals spellcheckSupport [ hunspell ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Carbon
Cocoa
CoreFoundation
CoreText
IOKit
++ lib.optionals (!useBundledLuaJIT) [ luajit ];
mesonFlags = [
(lib.mesonEnable "alsa" alsaSupport)
(lib.mesonEnable "openal" openalSupport)
(lib.mesonEnable "libpulse" pulseaudioSupport)
(lib.mesonEnable "portaudio" portaudioSupport)
(lib.mesonEnable "avisynth" false)
(lib.mesonEnable "hunspell" spellcheckSupport)
(lib.mesonBool "build_osx_bundle" stdenv.hostPlatform.isDarwin)
(lib.mesonBool "enable_update_checker" false)
(lib.mesonBool "system_luajit" (!useBundledLuaJIT))
];
hardeningDisable = [
@@ -121,38 +106,39 @@ stdenv.mkDerivation (finalAttrs: {
"relro"
];
patches = [
(fetchpatch {
name = "move-iconv-include-to-charset_conv.h.patch";
url = "https://github.com/arch1t3cht/Aegisub/commit/b8f4c98c4cbc698e4adbba302c2dc328fe193435.patch";
hash = "sha256-dCm/VG+8yK7qWKWF4Ew/M2hbbAC/d3hiuRglR9BvWtw=";
})
] ++ lib.optionals (!useBundledLuaJIT) [
./000-remove-bundled-luajit.patch
];
strictDeps = true;
# error: unknown type name 'NSUInteger'
postPatch = ''
patchShebangs tools/respack.py
# TODO: Tests require wrapped GoogleTest; upstream support for
# system version?
substituteInPlace meson.build \
--replace-fail "subdir('tests')" "# subdir('tests')"
# https://github.com/TypesettingTools/Aegisub/issues/191
substituteInPlace src/dialog_colorpicker.cpp \
--replace-fail "NSUInteger" "size_t"
'';
env = {
NIX_CFLAGS_COMPILE = "-I${lib.getDev luajit}/include";
NIX_CFLAGS_LINK = "-L${lib.getLib luajit}/lib";
};
preConfigure = ''
export FORCE_GIT_VERSION=${finalAttrs.version}
# Inject the version, per the AUR package:
# <https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=aegisub-arch1t3cht&id=bbbea73953858fc7bf2775a0fb92cec49afb586c>
preBuild = ''
cat > git_version.h <<EOF
#define BUILD_GIT_VERSION_NUMBER 0
#define BUILD_GIT_VERSION_STRING "${finalAttrs.version}"
EOF
'';
cmakeBuildDir = "build-directory";
strictDeps = true;
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/{Applications,bin}
mv Aegisub.app $out/Applications
makeWrapper $out/Applications/Aegisub.app/Contents/MacOS/aegisub $out/bin/aegisub
'';
meta = {
homepage = "https://github.com/wangqr/Aegisub";
description = "Advanced subtitle editor; wangqr's fork";
homepage = "https://github.com/TypesettingTools/Aegisub";
description = "Advanced subtitle editor";
longDescription = ''
Aegisub is a free, cross-platform open source tool for creating and
modifying subtitles. Aegisub makes it quick and easy to time subtitles to
pkgs/by-name/an/ansible-navigator/package.nix
+2 -2
View File
@@ -7,7 +7,7 @@
}:
python3Packages.buildPythonApplication rec {
pname = "ansible-navigator";
version = "24.10.0";
version = "24.12.0";
pyproject = true;
disabled = python3Packages.pythonOlder "3.10";
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
src = fetchPypi {
inherit version;
pname = "ansible_navigator";
hash = "sha256-UPfRfxDkD6HHClBdrFo4a84wLGtFOzMNcy8RrIgT6ik=";
hash = "sha256-+DJXSwwTIjF0b/i5NHCrnR9N+nMyl8of+zyEmmTzboQ=";
};
build-system = with python3Packages; [
pkgs/by-name/an/anydesk/package.nix
-1
View File
@@ -145,7 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [
shyim
cheriimoya
];
};
})
pkgs/by-name/at/atlas/package.nix
+3 -3
View File
@@ -9,19 +9,19 @@
buildGoModule rec {
pname = "atlas";
version = "0.29.0";
version = "0.29.1";
src = fetchFromGitHub {
owner = "ariga";
repo = "atlas";
rev = "v${version}";
hash = "sha256-synQZAOnX5Xw5d7pHPr7eaycf/YErktCjlsPVwbyLks=";
hash = "sha256-riXtXiMhViAca6Dw32MOquLYWZPuepTS/M0rgkXdap0=";
};
modRoot = "cmd/atlas";
proxyVendor = true;
vendorHash = "sha256-bQNcLFSMED5zFxf319fAeLLrVeZMCV/33s9hCm1elFs=";
vendorHash = "sha256-U5QGX2M2STHZ5GDZ905yw6v5+ox57y5pqqfD3Bo/WpI=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/au/automatic-timezoned/package.nix
+3 -3
View File
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned";
version = "2.0.40";
version = "2.0.42";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = pname;
rev = "v${version}";
sha256 = "sha256-q7WEG5Y8YpRUwNgp+SLi2eV9Z/Ork6+QZmPqxpUf60I=";
sha256 = "sha256-HbBxzIuni106kz3YX68Mk+ecb605hugcMf/QMLzElKA=";
};
cargoHash = "sha256-DJAQqPRcscYdrMYP0L09T6TtmDh3wuS89cWCvscyAak=";
cargoHash = "sha256-JfEyak0ORuXwR+QwVS3sjIJ+/eZIpIvU0MBREv2EPdg=";
meta = with lib; {
description = "Automatically update system timezone based on location";
pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "aws-codeartifact-proxy";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "sktan";
repo = "aws-codeartifact-proxy";
rev = "v${version}";
hash = "sha256-289iYPI8J64nRa0PTf47/FQAEqA+rTzalz6S71vFLzs=";
hash = "sha256-+P0AIg5m7nePy+Yd445nVfLVxya80Om9lJTPKZeTshc=";
};
sourceRoot = "${src.name}/src";
pkgs/by-name/aw/aws-signing-helper/package.nix
+38
View File
@@ -0,0 +1,38 @@
{
buildGoModule,
fetchFromGitHub,
lib,
bash,
}:
buildGoModule rec {
pname = "aws-signing-helper";
version = "1.4.0";
src = fetchFromGitHub {
owner = "aws";
repo = "rolesanywhere-credential-helper";
rev = "v${version}";
hash = "sha256-CIUhO+5gMIknB3NwYwaBbtZEkW2x/U2Bi9Qbqn9bLuc=";
};
vendorHash = "sha256-QKKgBIocJoGbfs78PxNBLBi4KTDPtSuhzvsb6OBhNWQ=";
checkPhase = ''
runHook preCheck
export SHELL=${bash}/bin/bash
go test ./cmd/...
runHook postCheck
'';
postInstall = ''
mv $out/bin/rolesanywhere-credential-helper $out/bin/aws_signing_helper
'';
meta = {
description = "AWS Signing Helper for IAM Roles Anywhere";
homepage = "https://github.com/aws/rolesanywhere-credential-helper";
changelog = "https://github.com/aws/rolesanywhere-credential-helper/releases/tag/v${version}";
license = lib.licenses.asl20;
mainProgram = "aws_signing_helper";
maintainers = with lib.maintainers; [ pandanz ];
};
}
pkgs/by-name/ba/basedpyright/package.nix
+5 -5
View File
@@ -16,16 +16,16 @@
buildNpmPackage rec {
pname = "basedpyright";
version = "1.22.1";
version = "1.23.1";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
rev = "refs/tags/v${version}";
hash = "sha256-vf4N0JwjFJKqpYT5pUBiTdvVmWhLqZJ7lE4ryyjEOW8=";
tag = "v${version}";
hash = "sha256-w3QcvAHwEM1kdRY/780yr2kQQ2tCEvNeLHBm9bgAjMI=";
};
npmDepsHash = "sha256-dkDAdLqp2OqUPaOujgZSZtVZPD/PTOazGcTZ4X7lWvI=";
npmDepsHash = "sha256-cEpBeEjOdArnLekS5uUk9OrsACZrvY63i8pYYvDSnbI=";
npmWorkspace = "packages/pyright";
preBuild = ''
@@ -94,7 +94,7 @@ buildNpmPackage rec {
};
meta = {
changelog = "https://github.com/detachhead/basedpyright/releases/tag/${version}";
changelog = "https://github.com/detachhead/basedpyright/releases/tag/${src.tag}";
description = "Type checker for the Python language";
homepage = "https://github.com/detachhead/basedpyright";
license = lib.licenses.mit;
pkgs/by-name/ba/bazelisk/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.24.1";
version = "1.25.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RuSsX20n8W9Fo5idkOhUPo7ESW7xMBKLHPYRNO7wyjA=";
sha256 = "sha256-1/J/Y2NlIghxQS/5CnGX+2z+glOeOZVEgSE4KWft9Zw=";
};
vendorHash = "sha256-r87F8wjF/LrIb/evdtq8y3R15bEc9mNjQt7QsB4BYfo=";
vendorHash = "sha256-kXv7q32cFD9mwWsFaod7QPn3el72P4ugVc4DGwez8v0=";
doCheck = false;
pkgs/by-name/c3/c3c/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "c3c";
version = "0.6.4";
version = "0.6.5";
src = fetchFromGitHub {
owner = "c3lang";
repo = "c3c";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-nSsNLde9jK+GgSp6DXXmD31+un7peK6t/vnzM7hZDFg=";
hash = "sha256-2OxUHnmFtT/TunfO+fOBOrkaHKlnqpO1wJWs79wkvAY=";
};
postPatch = ''
pkgs/by-name/ca/cargo-leptos/package.nix
+3 -3
View File
@@ -16,16 +16,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "cargo-leptos";
version = "0.2.22";
version = "0.2.24";
src = fetchFromGitHub {
owner = "leptos-rs";
repo = pname;
rev = "v${version}";
hash = "sha256-QPCYKlbPHuSBmwfkKdYhcVF81Lnirf65IYao7UVxz9Q=";
hash = "sha256-KNasxy/hEU04H/xAV3y92OtxBmYgA0RZjCQnC/XvBoo=";
};
cargoHash = "sha256-vtceKtYU8Jslk0PnQD/kGPFO4tDOp0TMYDFqkLy4j6U=";
cargoHash = "sha256-dxDmJVkkdT6hbhboyn8XwMJp379xAVZ8GFVp3F+LtWA=";
buildInputs = optionals isDarwin [
SystemConfiguration
pkgs/by-name/ca/catppuccin-discord/package.nix
+100
View File
@@ -0,0 +1,100 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
yarnConfigHook,
npmHooks,
nodejs-slim,
fetchYarnDeps,
flavour ? [ "mocha" ],
accents ? [ "blue" ],
}:
let
validFlavours = [
"mocha"
"macchiato"
"frappe"
"latte"
];
validAccents = [
"rosewater"
"flamingo"
"pink"
"mauve"
"red"
"maroon"
"peach"
"yellow"
"green"
"teal"
"sky"
"sapphire"
"blue"
"lavender"
];
in
lib.checkListOfEnum "Invalid accent, valid accents are ${toString validAccents}" validAccents
accents
lib.checkListOfEnum
"Invalid flavour, valid flavours are ${toString validFlavours}"
validFlavours
flavour
stdenvNoCC.mkDerivation
(finalAttrs: {
pname = "catppuccin-discord";
version = "0-unstable-2024-12-08";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "discord";
rev = "16b1e5156583ee376ded4fa602842fa540826bbc";
hash = "sha256-ECVHRuHbe3dvwrOsi6JAllJ37xb18HaUPxXoysyPP70=";
};
nativeBuildInputs = [
yarnConfigHook
npmHooks.npmInstallHook
nodejs-slim
];
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-2N4UI6Ap+zk7jtDCAsjGtwfDSiyOtB9YDOXUxYRCw60=";
};
buildPhase = ''
runHook preBuild
export HOME=$(mktemp -d)
yarn --offline release
runHook postBuild
'';
# "true" disables the dist phase, as there are no binaries and installation of themes
# will be handled in installPhase below.
distPhase = "true";
installPhase = ''
runHook preInstall
mkdir -p $out/share
for FLAVOUR in ${toString flavour}; do
for ACCENT in ${toString accents}; do
cp -va dist/dist/catppuccin-"$FLAVOUR"-"$ACCENT".theme.css $out/share
done;
done;
runHook postInstall
'';
meta = {
description = "Soothing pastel theme for Discord";
homepage = "https://github.com/catppuccin/discord";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ NotAShelf ];
platforms = lib.platforms.all;
sourceProvenance = with lib.sourceTypes; [ fromSource ];
};
})
pkgs/by-name/cl/cloud-hypervisor/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "cloud-hypervisor";
version = "42.0";
version = "43.0";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
hash = "sha256-AuKUwYxAXY/rNQk5Jx4WxGj+wChRrDkw8fp3uO3KBv0=";
hash = "sha256-drxJtlvBpkK3I7Ob3+pH4KLUq53GWXe1pmv7CI3bbP4=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-xqMUB9aqkUIpnX0U30CfiWmjDI7IS5SuJIKF5byXIxk=";
cargoHash = "sha256-wifctp30ApnxtRMlzksoSGrIJUT1cB0p1RBxfyITuZI=";
separateDebugInfo = true;
pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
}:
buildGoModule rec {
pname = "cloudflare-dynamic-dns";
version = "4.3.11";
version = "4.3.12";
src = fetchFromGitHub {
owner = "zebradil";
repo = "cloudflare-dynamic-dns";
rev = "refs/tags/${version}";
hash = "sha256-gnTfzlqJ80zTvXLOXT/HTDS/oxBU5D22N4mNtGAEn7o=";
hash = "sha256-28fIxwQmM9Lmu5Ak31+5/zw/syYwBDnQDZ0CYfmMR+U=";
};
vendorHash = "sha256-qahW01gSeWaTtot2zQ6R3T3ypgUsOO5R4OHvxq1+7mk=";
vendorHash = "sha256-ie5/9qChgEWXKPqhbJzOalKPxTBr4UN9exxvfB8/HrQ=";
subPackages = ".";
pkgs/by-name/cr/credhub-cli/package.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "credhub-cli";
version = "2.9.39";
version = "2.9.40";
src = fetchFromGitHub {
owner = "cloudfoundry-incubator";
repo = "credhub-cli";
rev = version;
sha256 = "sha256-JILXoad086dMfHZEq+YqzVhKzE++MgOcMS+oUi3xsh0=";
sha256 = "sha256-9W/rn56RM+ooq18jCH/5m54bxAQWzcDsjx7V6T0J/yU=";
};
# these tests require network access that we're not going to give them
pkgs/by-name/ct/ctlptl/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "ctlptl";
version = "0.8.36";
version = "0.8.37";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-r3WDo8ZNXc7a0BgJ4A4wluarwvbePL70//nJKt6u55I=";
hash = "sha256-yx1Fjsad7mjFmv/BFGZwH9xbidGXLT0FKI/cgMi2bU8=";
};
vendorHash = "sha256-d9TijRzBpMvRrOMexGtewtAA9XpLwDTjPnPzt7G67Cs=";
pkgs/by-name/cu/cue/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "cue";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "cue-lang";
repo = "cue";
rev = "v${version}";
hash = "sha256-OneL29/d+OtOgcbCzl7B+sVsxF/gN2jA/36HthYXiQ0=";
hash = "sha256-CLWPRVrfFQUwoLbZttetuq1T/Gb7vVEcrD7dxMzfgjA=";
};
vendorHash = "sha256-jl8TR1kxame30l7DkfOEioWA9wK/ACTNofiTi++vjuI=";
pkgs/by-name/da/dae/package.nix
+3 -3
View File
@@ -8,17 +8,17 @@
}:
buildGoModule rec {
pname = "dae";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "daeuniverse";
repo = "dae";
rev = "v${version}";
hash = "sha256-Vdh5acE5i/bJ8VXOm+9OqZQbxvqv4TS/t0DDfBs/K5g=";
hash = "sha256-yW3GDflTd9I4RreWtLQE92aP7BnswJHx44jmTZ81kP8=";
fetchSubmodules = true;
};
vendorHash = "sha256-0Q+1cXUu4EH4qkGlK6BIpv4dCdtSKjb1RbLi5Xfjcew=";
vendorHash = "sha256-nThkNyH6TUcFej9IGJ/jME0dGK517d5vJueNU7x86o8=";
proxyVendor = true;
pkgs/by-name/da/dart-sass/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@ let
in
buildDartApplication rec {
pname = "dart-sass";
version = "1.82.0";
version = "1.83.0";
src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
hash = "sha256-uGiD+tX6KmygMW5VNJrCGr6fFJnlMdj9QisHpPdMdN0=";
hash = "sha256-BT9ubYNireRXWqTHRrL7gHXle6tX3pjKG3siQ9TNf1M=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
pkgs/by-name/da/dart-sass/pubspec.lock.json
+26 -26
View File
@@ -280,11 +280,11 @@
"dependency": "transitive",
"description": {
"name": "http_multi_server",
"sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
"sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.1"
"version": "3.2.2"
},
"http_parser": {
"dependency": "transitive",
@@ -300,11 +300,11 @@
"dependency": "transitive",
"description": {
"name": "io",
"sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
"sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.4"
"version": "1.0.5"
},
"js": {
"dependency": "direct main",
@@ -370,11 +370,11 @@
"dependency": "transitive",
"description": {
"name": "matcher",
"sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.12.16+1"
"version": "0.12.17"
},
"meta": {
"dependency": "direct main",
@@ -450,11 +450,11 @@
"dependency": "direct main",
"description": {
"name": "package_config",
"sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
"sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
"version": "2.1.1"
},
"path": {
"dependency": "direct main",
@@ -520,11 +520,11 @@
"dependency": "direct main",
"description": {
"name": "pub_semver",
"sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
"sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
"version": "2.1.5"
},
"pubspec_parse": {
"dependency": "direct dev",
@@ -600,21 +600,21 @@
"dependency": "direct main",
"description": {
"name": "source_maps",
"sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
"sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.10.12"
"version": "0.10.13"
},
"source_span": {
"dependency": "direct main",
"description": {
"name": "source_span",
"sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.10.0"
"version": "1.10.1"
},
"stack_trace": {
"dependency": "direct main",
@@ -640,41 +640,41 @@
"dependency": "direct main",
"description": {
"name": "stream_transform",
"sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
"sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
"version": "2.1.1"
},
"string_scanner": {
"dependency": "direct main",
"description": {
"name": "string_scanner",
"sha256": "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6",
"sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
"version": "1.4.1"
},
"term_glyph": {
"dependency": "direct main",
"description": {
"name": "term_glyph",
"sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
"sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.1"
"version": "1.2.2"
},
"test": {
"dependency": "direct dev",
"description": {
"name": "test",
"sha256": "22eb7769bee38c7e032d532e8daa2e1cc901b799f603550a4db8f3a5f5173ea2",
"sha256": "43490fe4c0f5ecb898f3fa1cdcdad8d521d7f6ff17ebdc4e8cd32b2e99524a20",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.25.12"
"version": "1.25.13"
},
"test_api": {
"dependency": "transitive",
@@ -710,11 +710,11 @@
"dependency": "direct dev",
"description": {
"name": "test_process",
"sha256": "217f19b538926e4922bdb2a01410100ec4e3beb4cc48eae5ae6b20037b07bbd6",
"sha256": "ea79c090deffc87d8276a5d28bb498d080a9873be6b1074d9dcfb82eb87e138e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
"version": "2.1.1"
},
"type_plus": {
"dependency": "transitive",
@@ -750,11 +750,11 @@
"dependency": "direct main",
"description": {
"name": "watcher",
"sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
"sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.0"
"version": "1.1.1"
},
"web": {
"dependency": "transitive",
pkgs/by-name/du/dunst/package.nix
+21 -14
View File
@@ -23,7 +23,7 @@
pango,
xorgproto,
librsvg,
testers,
versionCheckHook,
nix-update-script,
withX11 ? true,
withWayland ? true,
@@ -31,13 +31,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dunst";
version = "1.12.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "dunst-project";
repo = "dunst";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-rnR/AErsjsaOMM/aF8VXZHV8b8OiUMRCi8IFLT4/8Vo=";
tag = "v${finalAttrs.version}";
hash = "sha256-MC35UE6cA1xA1qaOppvHAjuevbl2z0Twct1G5Uv84pU=";
};
nativeBuildInputs = [
@@ -75,13 +75,16 @@ stdenv.mkDerivation (finalAttrs: {
"man"
];
makeFlags = [
"PREFIX=$(out)"
"VERSION=$(version)"
"SYSCONFDIR=$(out)/etc"
"SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
] ++ lib.optional (!withX11) "X11=0" ++ lib.optional (!withWayland) "WAYLAND=0";
makeFlags =
[
"PREFIX=$(out)"
"VERSION=$(version)"
"SYSCONFDIR=$(out)/etc"
"SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
]
++ lib.optional (!withX11) "X11=0"
++ lib.optional (!withWayland) "WAYLAND=0";
postInstall = ''
wrapProgram $out/bin/dunst \
@@ -102,16 +105,20 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "jq" "${lib.getExe jq}"
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
};
updateScript = nix-update-script { };
};
meta = {
description = "Lightweight and customizable notification daemon";
homepage = "https://dunst-project.org/";
changelog = "https://github.com/dunst-project/dunst/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.bsd3;
mainProgram = "dunst";
maintainers = with lib.maintainers; [
pkgs/by-name/ev/evcc/package.nix
+2 -2
View File
@@ -17,13 +17,13 @@
buildGoModule rec {
pname = "evcc";
version = "0.131.11";
version = "0.131.12";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
rev = version;
hash = "sha256-fzob2r5VJczle+qevLeTefUAVLgn4sEUVvydnbvbrQI=";
hash = "sha256-wctSgB5NRuS1+g+MEiHDS4oyFVNdwP2WFJF5kj9nFig=";
};
vendorHash = "sha256-xravbTVzmS7loLKtzuT3Yw7FkEnDFLw+GrwnAVV36Yw=";
pkgs/by-name/ev/evolution-data-server/package.nix
+34 -18
View File
@@ -1,6 +1,7 @@
{
stdenv,
lib,
buildPackages,
fetchurl,
pkg-config,
gnome,
@@ -133,25 +134,40 @@ stdenv.mkDerivation rec {
json-glib
];
cmakeFlags = [
"-DENABLE_VALA_BINDINGS=ON"
"-DENABLE_INTROSPECTION=ON"
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
"-DWITH_PHONENUMBER=ON"
"-DENABLE_GTK=${lib.boolToString withGtk3}"
"-DENABLE_EXAMPLES=${lib.boolToString withGtk3}"
"-DENABLE_CANBERRA=${lib.boolToString withGtk3}"
"-DENABLE_GTK4=${lib.boolToString withGtk4}"
"-DENABLE_OAUTH2_WEBKITGTK=${lib.boolToString (withGtk3 && enableOAuth2)}"
"-DENABLE_OAUTH2_WEBKITGTK4=${lib.boolToString (withGtk4 && enableOAuth2)}"
];
cmakeFlags =
[
"-DENABLE_VALA_BINDINGS=ON"
"-DENABLE_INTROSPECTION=ON"
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
"-DWITH_PHONENUMBER=ON"
"-DENABLE_GTK=${lib.boolToString withGtk3}"
"-DENABLE_EXAMPLES=${lib.boolToString withGtk3}"
"-DENABLE_CANBERRA=${lib.boolToString withGtk3}"
"-DENABLE_GTK4=${lib.boolToString withGtk4}"
"-DENABLE_OAUTH2_WEBKITGTK=${lib.boolToString (withGtk3 && enableOAuth2)}"
"-DENABLE_OAUTH2_WEBKITGTK4=${lib.boolToString (withGtk4 && enableOAuth2)}"
]
++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
(lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages))
];
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace cmake/modules/SetupBuildFlags.cmake \
--replace "-Wl,--no-undefined" ""
substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \
--replace "G_OS_WIN32" "__APPLE__"
'';
strictDeps = true;
postPatch =
lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace cmake/modules/SetupBuildFlags.cmake \
--replace "-Wl,--no-undefined" ""
substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \
--replace "G_OS_WIN32" "__APPLE__"
''
+ lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
substituteInPlace src/addressbook/libebook-contacts/CMakeLists.txt --replace-fail \
'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table' \
'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table'
substituteInPlace src/camel/CMakeLists.txt --replace-fail \
'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables' \
'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables'
'';
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
ln -s $out/lib/evolution-data-server/*.dylib $out/lib/
pkgs/by-name/fa/fabric-ai/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "fabric-ai";
version = "1.4.119";
version = "1.4.122";
src = fetchFromGitHub {
owner = "danielmiessler";
repo = "fabric";
rev = "v${version}";
hash = "sha256-+KmhOMboSZU5LInNbknz3f3lIUGygApeefr1aaA44V0=";
hash = "sha256-wFVb2IdYB1T7wozQcjxLE7uVRsIFkPL5rS/8V0LnRcg=";
};
vendorHash = "sha256-adBp4ehQIME0x7YmCLEFqZHAMrTXry7pYXFagBHXxGE=";
vendorHash = "sha256-eV+Wb3IL8veO7NF5Y5zLgTW9eHJF6ke/0SrDojHF3X8=";
ldflags = [
"-s"
pkgs/by-name/fa/fastddsgen/package.nix
+2 -2
View File
@@ -9,7 +9,7 @@
let
pname = "fastddsgen";
version = "4.0.2";
version = "4.0.3";
gradle = gradle_7;
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
repo = "Fast-DDS-Gen";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-dwShzcS0sCiVZghpjvPYvYu89NNkGWUWPsAzwdzfAqo=";
hash = "sha256-jim6Yqo0Gw8oj7AFzI7BEkvS2WZiT1KawbclIFyPpac=";
};
nativeBuildInputs = [
pkgs/by-name/ga/galaxy-buds-client/deps.json
Generated
+146 -96
View File
@@ -6,13 +6,8 @@
},
{
"pname": "Avalonia",
"version": "11.1.0-beta2",
"hash": "sha256-iia9Ks8JoHWT/Drl9zJecOQsQPxVYLA/Qp/iFCXj4/Y="
},
{
"pname": "Avalonia",
"version": "11.1.0-rc1",
"hash": "sha256-NjSOKJKWcrKcqEP/FAs14Y+ZzeitSyd7FvQaWpTUqhA="
"version": "11.2.2",
"hash": "sha256-lYWqgjYOyh4pg+TdkgqeFhi8OMI1p9IOvSntVXo5zvE="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
@@ -31,13 +26,13 @@
},
{
"pname": "Avalonia.Controls.ColorPicker",
"version": "11.1.0-rc1",
"hash": "sha256-u8CAZJIRbuXGxRivaGPlaXfxPQf7OCKUAU6jisYdaZs="
"version": "11.2.2",
"hash": "sha256-Mmp7Mjy9Y6uvkfjE8KLWoJWcVZHiJwqmhQupsxYRExo="
},
{
"pname": "Avalonia.Controls.DataGrid",
"version": "11.1.0-rc1",
"hash": "sha256-0iiNKBQCmnO5rZUzGcsju5O81e0URM35FEz1FTZUHls="
"version": "11.2.2",
"hash": "sha256-RbkISZEp55N9dtqvPp0Ej2/wpU/YzI4wgJjBCJnIGl4="
},
{
"pname": "Avalonia.Controls.ItemsRepeater",
@@ -51,38 +46,38 @@
},
{
"pname": "Avalonia.Desktop",
"version": "11.1.0-rc1",
"hash": "sha256-8j1qWibl5JUqAaS893TEzBQoWzsVqgAVMX4xVxWmKWo="
"version": "11.2.2",
"hash": "sha256-ucd2SH0CAjwE5TSgwhhzYZqMD1zuTlR7qLQDl3mYGvg="
},
{
"pname": "Avalonia.Diagnostics",
"version": "11.1.0-rc1",
"hash": "sha256-UD0djXIpzVKxeWw5B99AGsibUy5hGF70mI9vZny6vOk="
"version": "11.2.2",
"hash": "sha256-aOji+/TYSP0l3dpn62bvWMdce2YkYi5xzRPC3nS6ZGc="
},
{
"pname": "Avalonia.Fonts.Inter",
"version": "11.1.0-rc1",
"hash": "sha256-kvGlKhBjDB8A5tTe0HPhVqVKy0eVjz6SE/qMQOzDyZ4="
"version": "11.2.2",
"hash": "sha256-H1h+PQBW8vrvJnKQZ+vcFaxCVssBcuHGBQw1Jj8dMR0="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.1.0-rc1",
"hash": "sha256-Oh9QqPL/O3a0kUsv/IHAg3/lDzQLRl5v4L5mGoqasbQ="
"version": "11.2.2",
"hash": "sha256-c/u6TX1Hl2h8B5xe7Zo1AJ6cR5BazI19NRnw56a36y0="
},
{
"pname": "Avalonia.Markup.Xaml.Loader",
"version": "11.1.0-rc1",
"hash": "sha256-fQM6vr+GHbwARROYFrEkOU9ZqBBCPCmwfa17eXeNqHA="
"version": "11.2.2",
"hash": "sha256-H3Hv9BEsDuqIzVlZAtjE6/oJSFiTQffz4K1fRecfoQ4="
},
{
"pname": "Avalonia.Native",
"version": "11.1.0-rc1",
"hash": "sha256-BHdL5g1rYx7hOYXE60dmzlZ1N+7NFl8SD/SeM9nqEKA="
"version": "11.2.2",
"hash": "sha256-2Scuc+OCtfLChDYCi4feCh9XUrgJpbVaek3xRnpOGDE="
},
{
"pname": "Avalonia.ReactiveUI",
"version": "11.1.0-rc1",
"hash": "sha256-RaSbdi+TtAeNR3NggoM4TsmMMhwGE/uJyrxBF6ubM94="
"version": "11.2.2",
"hash": "sha256-Rr/wmmS47korAK0nAplpWCWrS1O9YZZD6i+efR7btN0="
},
{
"pname": "Avalonia.Remote.Protocol",
@@ -91,13 +86,8 @@
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.1.0-beta2",
"hash": "sha256-17FrZr4pmGST+aV/8Lg1iYGl42r3UhyTIJ61ltXxRu8="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.1.0-rc1",
"hash": "sha256-fawaToCwZWwvRJQKYVJYZeMWQEW8XPrNBJEZ3lXLOe8="
"version": "11.2.2",
"hash": "sha256-lMb3VvHXQGxn0dyEGkzKXxFocvPJUaNnOpRJpHF9ORU="
},
{
"pname": "Avalonia.Skia",
@@ -111,78 +101,83 @@
},
{
"pname": "Avalonia.Skia",
"version": "11.1.0-rc1",
"hash": "sha256-F06oKB97Se3JxGZRAsQCGklu5wS64agGCSUT9IBQcVU="
"version": "11.2.0",
"hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o="
},
{
"pname": "Avalonia.Skia",
"version": "11.2.2",
"hash": "sha256-YmOT+r4OfyOyg8epho6bVaEW2HImEfsZ5rNqhWIY5Fk="
},
{
"pname": "Avalonia.Svg.Skia",
"version": "11.1.0-rc1",
"hash": "sha256-prRC6GZ+dtVdYFjlGU20xHrkNHB69jegEjKFv+GK7Vw="
"version": "11.2.0.2",
"hash": "sha256-76mxaTEgJ5HCIxX6P0+V5Kd+3Vk41YXLuHmc4Rr+/rE="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "11.1.0-rc1",
"hash": "sha256-Yy3gHV9SoZAVFHuAABjBqfdRNEVfFprAdx38e7tNucU="
"version": "11.2.2",
"hash": "sha256-+wBsbMAMDMRkZN/t94qwQgyew8eCY2RBreoTCgs3KJU="
},
{
"pname": "Avalonia.Themes.Simple",
"version": "11.1.0-rc1",
"hash": "sha256-QfNeSeCbwQlVRCFYa8BjJlYnkSk3TC7ACenG3RAUFWU="
"version": "11.2.2",
"hash": "sha256-HXkfpUuTN8hSBMXCCGW78+2GC5w3VdTUp1qm7HvUZPI="
},
{
"pname": "Avalonia.Win32",
"version": "11.1.0-rc1",
"hash": "sha256-kScofxDFq4+fAogQcSTu7axKBF2cqUjwH4c9ZbKx7s4="
"version": "11.2.2",
"hash": "sha256-pouvlprL9VeEi1dG5zR6nFj+I/4CIjH1rHbV3N9/FHg="
},
{
"pname": "Avalonia.X11",
"version": "11.1.0-rc1",
"hash": "sha256-m0MTISz3KlQrccEIkSR+XEoiXY/iUGnQuH8NFPV6Y/Y="
"version": "11.2.2",
"hash": "sha256-86EIfm1zEvKleliP58xAs7KGxP/n7x2m8ca8C9W1XqA="
},
{
"pname": "Avalonia.Xaml.Behaviors",
"version": "11.1.0-rc1",
"hash": "sha256-/Gy7rv7nV4WYc0RCs+VpZq+qVDp61QQ3ibmhr8ligy4="
"version": "11.2.0.1",
"hash": "sha256-eGY1ib2nmeRNwCxjcY3xxCjL+hsw2f0iMl2ZH7UenpY="
},
{
"pname": "Avalonia.Xaml.Interactions",
"version": "11.1.0-rc1",
"hash": "sha256-xtOd6O+NVklPrKVui+J2bTyp7IBxMp8e7shtTzMNaH4="
"version": "11.2.0.1",
"hash": "sha256-5WLAl3gMywuGmLbrVDoZS0QxoMs5b5TaLCMk3itYROw="
},
{
"pname": "Avalonia.Xaml.Interactions.Custom",
"version": "11.1.0-rc1",
"hash": "sha256-DHYhji8JXSzpKov6Gmj51ldoppcjwpGGlrkqgOHPYug="
"version": "11.2.0.1",
"hash": "sha256-lfyyVJ7Hh0bKj9oaV3MB/d5zi+Epv8QXHwKG3Y1SzXs="
},
{
"pname": "Avalonia.Xaml.Interactions.DragAndDrop",
"version": "11.1.0-rc1",
"hash": "sha256-e9Z90XkZ2i83ziUwJLHI+Ut7sW85MC4XgtY5QlFapSM="
"version": "11.2.0.1",
"hash": "sha256-h/UPHGQPESoUQII5s1wElvBUm9y/wZwBbx4hmjBVE/Y="
},
{
"pname": "Avalonia.Xaml.Interactions.Draggable",
"version": "11.1.0-rc1",
"hash": "sha256-z6w5o5Mc9J8l8tr7oREEdMb5iOGlBm6Rq/tM+OrX334="
"version": "11.2.0.1",
"hash": "sha256-7jWbllNaDCauQoMDKY/WxurVSSUekF50HowYLrFveJM="
},
{
"pname": "Avalonia.Xaml.Interactions.Events",
"version": "11.1.0-rc1",
"hash": "sha256-k7BPbdS5muS1VfNYBybjMmwPHfaJIYasgx14tq6pNKU="
"version": "11.2.0.1",
"hash": "sha256-RowY0nh8O9BVF5X2GV+9pkVYoMDY20MtYCuWfqe+X/k="
},
{
"pname": "Avalonia.Xaml.Interactions.Responsive",
"version": "11.1.0-rc1",
"hash": "sha256-jz/CUHWhc2TBlVyLiEZx4krwLMv2dSI9di70GIWZ/VE="
"version": "11.2.0.1",
"hash": "sha256-N/Hd4x0lMCrEzarkbb51h74PG1uU1geXuSKlV/ZEBNY="
},
{
"pname": "Avalonia.Xaml.Interactivity",
"version": "11.1.0-rc1",
"hash": "sha256-1JQR0Xgb1q7/XXx0fN8u3OvQwo64b630Cou3Gr6C8jg="
"version": "11.2.0.1",
"hash": "sha256-B6JJn52Yxu/ncUyBMqBprY6RskzB5sZes/3I9mmo1Qc="
},
{
"pname": "AvaloniaHex",
"version": "0.1.0",
"hash": "sha256-wMOcP+oSfe+Zhue5XbjI0w44ZOL4LuBbIgguH55C+ik="
"version": "0.1.3",
"hash": "sha256-EDOXfo0pmZE8xEfyB6OPO7/LRbZVs8T4OocUtxCvuWk="
},
{
"pname": "BouncyCastle.Cryptography",
@@ -211,13 +206,13 @@
},
{
"pname": "DynamicData",
"version": "7.9.5",
"hash": "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="
"version": "8.3.27",
"hash": "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="
},
{
"pname": "DynamicData",
"version": "8.3.27",
"hash": "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="
"version": "8.4.1",
"hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="
},
{
"pname": "ExCSS",
@@ -269,6 +264,11 @@
"version": "7.3.0.2",
"hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
},
{
"pname": "HarfBuzzSharp",
"version": "7.3.0.3",
"hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Linux",
"version": "2.8.2.3",
@@ -284,6 +284,11 @@
"version": "7.3.0.2",
"hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Linux",
"version": "7.3.0.3",
"hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "2.8.2.3",
@@ -299,6 +304,11 @@
"version": "7.3.0.2",
"hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
},
{
"pname": "HarfBuzzSharp.NativeAssets.macOS",
"version": "7.3.0.3",
"hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
},
{
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
"version": "2.8.2.3",
@@ -311,8 +321,13 @@
},
{
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
"version": "7.3.0.2",
"hash": "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="
"version": "7.3.0.3",
"hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
},
{
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
"version": "7.3.0.3-preview.2.2",
"hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
@@ -329,6 +344,11 @@
"version": "7.3.0.2",
"hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
},
{
"pname": "HarfBuzzSharp.NativeAssets.Win32",
"version": "7.3.0.3",
"hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
},
{
"pname": "Humanizer.Core",
"version": "2.14.1",
@@ -541,13 +561,13 @@
},
{
"pname": "ReactiveUI",
"version": "18.3.1",
"hash": "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="
"version": "19.5.41",
"hash": "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="
},
{
"pname": "ReactiveUI",
"version": "19.5.41",
"hash": "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="
"version": "20.1.1",
"hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="
},
{
"pname": "ReactiveUI.Fody",
@@ -761,13 +781,13 @@
},
{
"pname": "ScottPlot",
"version": "5.0.35",
"hash": "sha256-MLwAa/8nGHcBSoS8uz+NEP/9qrAZMe8DatQynuHrkQc="
"version": "5.0.37",
"hash": "sha256-S/kPaM24NCDKK7iQeYoryiQ+XqAdKZJBYECyN1Kn9bg="
},
{
"pname": "ScottPlot.Avalonia",
"version": "5.0.35",
"hash": "sha256-qO2aEh/Eq9ItbSjObyzl58UwIh4ME7zdd7nsQ1JnHw4="
"version": "5.0.37",
"hash": "sha256-Pb45qdo7jbgg08C3gEDmro5gzKhNyja8okXS41FWebM="
},
{
"pname": "Sentry",
@@ -811,8 +831,8 @@
},
{
"pname": "ShimSkiaSharp",
"version": "2.0.0-rc1",
"hash": "sha256-rzSatpDash9fSNZTo1pp6ghQyGPsoOmi2pwhj1vOuN8="
"version": "2.0.0.4",
"hash": "sha256-5XBMk4sjg2Yxr5rhoXWRsLDbZ2aTLumnFfi0Y662jTk="
},
{
"pname": "SkiaSharp",
@@ -829,6 +849,11 @@
"version": "2.88.8",
"hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
},
{
"pname": "SkiaSharp",
"version": "2.88.9",
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
},
{
"pname": "SkiaSharp.HarfBuzz",
"version": "2.88.8",
@@ -849,6 +874,11 @@
"version": "2.88.8",
"hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
},
{
"pname": "SkiaSharp.NativeAssets.Linux",
"version": "2.88.9",
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
},
{
"pname": "SkiaSharp.NativeAssets.Linux.NoDependencies",
"version": "2.88.8",
@@ -869,6 +899,11 @@
"version": "2.88.8",
"hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "2.88.9",
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
"version": "2.88.3",
@@ -884,6 +919,11 @@
"version": "2.88.8",
"hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
"version": "2.88.9",
"hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.3",
@@ -900,15 +940,20 @@
"hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
},
{
"pname": "Splat",
"version": "14.4.1",
"hash": "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "2.88.9",
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
},
{
"pname": "Splat",
"version": "14.8.12",
"hash": "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU="
},
{
"pname": "Splat",
"version": "15.1.1",
"hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="
},
{
"pname": "SQLitePCLRaw.bundle_e_sqlite3",
"version": "2.1.7",
@@ -931,18 +976,18 @@
},
{
"pname": "Svg.Custom",
"version": "2.0.0-rc1",
"hash": "sha256-9GbCNRjVodohzjqJkuHZV1sNuwO8rA2nYSSdd48YAHk="
"version": "2.0.0.4",
"hash": "sha256-Gp4zGWHJ2fEOmj8VNfPDukUPusxMsPhiz0jdcWT7u7Y="
},
{
"pname": "Svg.Model",
"version": "2.0.0-rc1",
"hash": "sha256-msdN/k77sF2EitKy5hufHZ5DK/fjKWXV+CM8U9T543k="
"version": "2.0.0.4",
"hash": "sha256-tMYfqm4ZYgnajWwKQIe6dc3qnoIWxbODfarIzwlWX80="
},
{
"pname": "Svg.Skia",
"version": "2.0.0-rc1",
"hash": "sha256-iKQOenzOfAGwmt8Tteb19L/WjY0c6aVQWJfW2DFAF9g="
"version": "2.0.0.4",
"hash": "sha256-xRB9GE2IxtV25py1S4y3R0Qk5lHYThu73O+YYu1VIoA="
},
{
"pname": "System.AppContext",
@@ -1104,6 +1149,11 @@
"version": "7.0.0",
"hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="
},
{
"pname": "System.IO.Pipelines",
"version": "8.0.0",
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
},
{
"pname": "System.Linq",
"version": "4.3.0",
@@ -1149,11 +1199,6 @@
"version": "4.4.0",
"hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.5.0",
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
},
{
"pname": "System.ObjectModel",
"version": "4.3.0",
@@ -1166,13 +1211,13 @@
},
{
"pname": "System.Reactive",
"version": "5.0.0",
"hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
"version": "6.0.0",
"hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
},
{
"pname": "System.Reactive",
"version": "6.0.0",
"hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
"version": "6.0.1",
"hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
},
{
"pname": "System.Reflection",
@@ -1443,5 +1488,10 @@
"pname": "Tmds.DBus.Protocol",
"version": "0.16.0",
"hash": "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="
},
{
"pname": "Tmds.DBus.Protocol",
"version": "0.20.0",
"hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
}
]
pkgs/by-name/ga/galaxy-buds-client/package.nix
+5 -3
View File
@@ -14,20 +14,22 @@
buildDotnetModule rec {
pname = "galaxy-buds-client";
version = "5.1.0";
version = "5.1.1";
src = fetchFromGitHub {
owner = "ThePBone";
repo = "GalaxyBudsClient";
rev = version;
hash = "sha256-9m9H0T4rD6HIvb15h7+Q7SgLk0PkISkN8ojjh7nsiwA=";
hash = "sha256-Cie8dInNzqMS6k2XP2P3fwMxSc6AabZHiIc6vcA7VhM=";
};
projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ];
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ];
dotnetFlags =
lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ]
++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-p:Runtimeidentifier=linux-arm64" ];
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
pkgs/by-name/ga/gat/package.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gat";
version = "0.19.2";
version = "0.19.3";
src = fetchFromGitHub {
owner = "koki-develop";
repo = "gat";
rev = "refs/tags/v${version}";
hash = "sha256-f0B+MHVtG73arkvUTSb+iYJ8p2fn5NvxfL6QBBOBTi8=";
hash = "sha256-MBRKp1S/6dizZR0zDyaNGqKsHI+vK6oTNkPuxwbf7os=";
};
vendorHash = "sha256-ns1jFmBvIfclb3SBtdg05qNBy18p6VjtEKrahtxJUM4=";
pkgs/by-name/go/go-ios/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "go-ios";
version = "1.0.162";
version = "1.0.166";
src = fetchFromGitHub {
owner = "danielpaulus";
repo = "go-ios";
rev = "v${version}";
sha256 = "sha256-lquOUs6oI3xMYPI1mNNU9xEsCRvQpbNElr6LoK3+aV0=";
sha256 = "sha256-Lao7cK7ZWeU0WXa9qDHlc+NuE9Ktl7k3mJXxIIfbROk=";
};
proxyVendor = true;
pkgs/by-name/go/google-cloud-sql-proxy/package.nix
+3 -3
View File
@@ -7,18 +7,18 @@
buildGoModule rec {
pname = "google-cloud-sql-proxy";
version = "2.14.1";
version = "2.14.2";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "cloud-sql-proxy";
rev = "v${version}";
hash = "sha256-GS+FILQI6z7bFgngDgnC+H5APILiDpBLkA+EFT4cWMw=";
hash = "sha256-jnecQkfZzg7psWOamJTpUnxjkW0tJkuGw06GGBNbub0=";
};
subPackages = [ "." ];
vendorHash = "sha256-TbVpYfAEo0WtteeEImcPORxgYhMdgayj+LcpLW3jAMo=";
vendorHash = "sha256-7jMDSW32MoHCN51yqLliUBfcjsE5l0mPvGXair5KLxA=";
checkFlags = [
"-short"
pkgs/by-name/hy/hyprland/package.nix
+5
View File
@@ -100,6 +100,10 @@ customStdenv.mkDerivation (finalAttrs: {
# Remove extra @PREFIX@ to fix pkg-config paths
sed -i "s#@PREFIX@/##g" hyprland.pc.in
substituteInPlace protocols/meson.build --replace-fail \
"wayland_scanner = dependency('wayland-scanner')" \
"wayland_scanner = dependency('wayland-scanner', native: true)"
'';
# variables used by generateVersion.sh script, and shown in `hyprctl version`
@@ -172,6 +176,7 @@ customStdenv.mkDerivation (finalAttrs: {
mesonBuildType = if debug then "debugoptimized" else "release";
dontStrip = debug;
strictDeps = true;
mesonFlags = concatLists [
(mapAttrsToList mesonEnable {
pkgs/by-name/hy/hyprlock/package.nix
+4 -2
View File
@@ -6,6 +6,7 @@
pkg-config,
libGL,
libxkbcommon,
hyprgraphics,
hyprlang,
hyprutils,
pam,
@@ -26,13 +27,13 @@
gcc14Stdenv.mkDerivation (finalAttrs: {
pname = "hyprlock";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprlock";
rev = "v${finalAttrs.version}";
hash = "sha256-sUIsjWpZLplSJXWyJcDZdvDweksXLH5r9GSkwg0kgBw=";
hash = "sha256-41/fFxlGCf1q+WJwdzSidr9+xJ7+td91XQ1+kzrZ+ts=";
};
strictDeps = true;
@@ -46,6 +47,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
buildInputs = [
cairo
file
hyprgraphics
hyprlang
hyprutils
libdrm
pkgs/by-name/ig/ignite-cli/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "ignite-cli";
version = "28.6.0";
version = "28.6.1";
src = fetchFromGitHub {
repo = "cli";
owner = "ignite";
rev = "v${version}";
hash = "sha256-N1Wwy5iWQHREIof4TL6PVpNONSJ6R+OSUiOmdXN6+/4=";
hash = "sha256-Ps4OxOPyBYdiW0y1L6z0ymc2/0dIQgsNinuhlRLpGDk=";
};
vendorHash = "sha256-G54QYz1IkbYMQaUTnIAjfhv2Kj6YtKf68CFjqB2GgQ0=";
vendorHash = "sha256-ks9wZUIwN0dOcXxxRk1Amxd0TPJBbLfKC9lzV4IMdjk=";
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/jb/jbrowse/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
let
pname = "jbrowse";
version = "2.17.0";
version = "2.18.0";
src = fetchurl {
url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage";
sha256 = "sha256-SqkUcsmnj77kL6YOdFP5Jm1LEaVNS+nrYgpckoHEPqg=";
sha256 = "sha256-1YtINJgOMXwLPT7eyS85ebNCxTF8TbvHU7gOq9qNyF4=";
};
appimageContents = appimageTools.extractType2 {
pkgs/by-name/jn/jnv/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "jnv";
version = "0.4.0";
version = "0.4.2";
src = fetchFromGitHub {
owner = "ynqa";
repo = "jnv";
rev = "v${version}";
hash = "sha256-WrvCiZA/aYj0CoTq/kw3Oa3WKTjdtO6OC+IOxBoWjSU=";
hash = "sha256-FkOcNQR/YyCufk7U4gdkmDBwkKns4Yze/T2Wx4PUFa8=";
};
cargoHash = "sha256-xF0sxoSo7z7lxrF3wFAmU7edREoWKBFBnZ6Xq22c8q0=";
cargoHash = "sha256-bX/a/GKUph8PocXxfOHQ+XfqFHtbnET0vSAwvSUqQzw=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
pkgs/by-name/ku/kubefirst/package.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "kubefirst";
version = "2.7.7";
version = "2.7.9";
src = fetchFromGitHub {
owner = "konstructio";
repo = "kubefirst";
rev = "refs/tags/v${version}";
hash = "sha256-aXZ1RwqmogEZOu9cxsrxiH0hVioUB5ph4QrsMnREd6c=";
hash = "sha256-nBYwvOgkkx3NXELK+h9SpapoMjAVauI9leCPhKNZfh0=";
};
vendorHash = "sha256-DYEEkduud1sXVao7xbJoyvmMhfMJUPswIs3v20tncwo=";
pkgs/by-name/li/libgpiod/package.nix
+2 -2
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgpiod";
version = "2.1.3";
version = "2.2";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
hash = "sha256-jYDqAirngSKqUlMI50I7gwZL/yePzZzQRblLT4H4BX0=";
hash = "sha256-rjUynbcCfHQOkMiDuvJ8JjEfBhTmp7EVdxsoGIuZKuw=";
};
nativeBuildInputs = [
pkgs/by-name/li/libsolv/package.nix
+2 -2
View File
@@ -17,14 +17,14 @@
}:
stdenv.mkDerivation rec {
version = "0.7.30";
version = "0.7.31";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
hash = "sha256-De2lQu80MjKvjnN0W3/Y9JwFbA8g7tleflVXC9Lib5Y=";
hash = "sha256-3HOW3bip+0LKegwO773upeKKLiLv7JWUGEJcFiH0lcw=";
};
cmakeFlags = [
pkgs/by-name/me/melange/package.nix
+3 -3
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "melange";
version = "0.17.3";
version = "0.18.1";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-26p73aPrjZ2+VdNwI8cDOIQgLgtqPgJ+pZd+2eaxapo=";
hash = "sha256-VVEmW2NqSqJYvBTGkfgvBzViTKgIj1uWi5F0X1ztN1E=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -25,7 +25,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-nmfzWRX6TGv080sxf1j8ZG/w+uOrLsqOLfk0ooz/muQ=";
vendorHash = "sha256-5d6T6MUeKPypjHwe1efK8rAujz/uIxEanMWeGhYvbc0=";
subPackages = [ "." ];
pkgs/by-name/me/metals/package.nix
+2 -2
View File
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "1.4.1";
version = "1.4.2";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-CVAPjeTYuv0w57EK/IldJcGz8mTQnyCGAjaUf6La2rU=";
outputHash = "sha256-bvdLEHJgtLAu7C/jLMpcmFOVqASPNbiyN3q4qtYL3ls=";
};
nativeBuildInputs = [
pkgs/by-name/mi/minio-client/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "minio-client";
version = "2024-11-17T19-35-25Z";
version = "2024-11-21T17-21-54Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-T99mHRRy0+Zmk+dlJVGg2h7wFnXKz5Prj21PZrkVWpI=";
sha256 = "sha256-z6ixa5nrKcrvaBC1V6/iXCeHFO4xOkFf/yJ8HLQQcaY=";
};
vendorHash = "sha256-teG+GrzmUgJ6QhcxDSbWXP32hRuCgoCvH2BoNL8ddUc=";
pkgs/by-name/mi/mint-y-icons/package.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-y-icons";
version = "1.7.9";
version = "1.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-LmFsU6rqkxfZPdvonFgWhoeCfKI+gCSotZ7o2KcGLIs=";
hash = "sha256-X62n7HQwlpnfl4rqy6CK1K9Do/tUyD8pB0bRW8djm6o=";
};
propagatedBuildInputs = [
pkgs/by-name/ok/okms-cli/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "okms-cli";
version = "0.1.2";
version = "0.1.4";
src = fetchFromGitHub {
owner = "ovh";
repo = "okms-cli";
rev = "refs/tags/v${version}";
hash = "sha256-We1Aq9dOzEa7M6tG8kiVGfWhXfkpdZaJsJ5MCM/HZL4=";
hash = "sha256-qdMmSchLP4xDUgDFomwvRyiljIFrhT8ydH1kkmr7vvw=";
};
vendorHash = "sha256-DyIqsvqTi6Yq8MADty/iSiDLgdd2vP/IDyCOm0yaQzk=";
vendorHash = "sha256-cPPHzYNMEQEllz1yCQGiW/EYPVv3cfkOswqf+9d9Onw=";
ldflags = [
"-s"
pkgs/by-name/or/oras/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "oras";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "oras-project";
repo = "oras";
rev = "v${version}";
hash = "sha256-M9YQUQHMt+CsTp/zDsPM2mwaUGYwjgBW1RY6j5jpYDk=";
hash = "sha256-iSmoD2HhzVrWQBaZ7HaIjcPmybl4JTVeVVfbn29i91Q=";
};
vendorHash = "sha256-I1iFayzNcU2K8YMTfMFU0PEZAjKGhCuJLEi7cwy/XW0=";
vendorHash = "sha256-zxcRMrr0mfSiuZpXYe7N0nJrEmiBTgw03+Yp4PYieBY=";
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/ph/phrase-cli/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "phrase-cli";
version = "2.34.1";
version = "2.35.2";
src = fetchFromGitHub {
owner = "phrase";
repo = "phrase-cli";
rev = version;
sha256 = "sha256-N+1kh4p6gzBnWPSs7U4Ay1kUtJ04W3G0f+PzzwCylRQ=";
sha256 = "sha256-PK8qrV1L9OX9DzfXfuwl3Zknhi08JN2wPtvsTZ9reZI=";
};
vendorHash = "sha256-mfg10IwrPiLpI+9Y0QybKS8wOBnt3+tqsXgtGV1eHAs=";
vendorHash = "sha256-UnPHYzxUf4G034tXL53bC2k0CYDtCi/jgXTFI2chF2U=";
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix
+43
View File
@@ -0,0 +1,43 @@
{
lib,
python3Packages,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication {
pname = "prometheus-rasdaemon-exporter";
version = "unstable-2023-03-15";
pyproject = true;
src = fetchFromGitHub {
owner = "sanecz";
repo = "prometheus-rasdaemon-exporter";
rev = "e37084edeb4d397dd360298cb22f18f83a35ff46";
hash = "sha256-O0Zzog+5jDixFRGbqmjPYi6JDpHbxpU4hKfsqTnexS8=";
};
build-system = with python3Packages; [
setuptools
setuptools-scm
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev9+ge37084e";
dependencies = with python3Packages; [
prometheus-client
];
pythonImportsCheck = [
"prometheus_rasdaemon_exporter"
];
doCheck = false; # no tests
meta = {
description = "Rasdaemon exporter for Prometheus";
homepage = "https://github.com/sanecz/prometheus-rasdaemon-exporter";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ hexa ];
mainProgram = "prometheus-rasdaemon-exporter";
};
}
pkgs/by-name/pr/proto/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "proto";
version = "0.43.1";
version = "0.43.2";
src = fetchFromGitHub {
owner = "moonrepo";
repo = "proto";
rev = "v${version}";
hash = "sha256-OvDkDbW7w805ZMLVg3yJqZCp6Xn8oW2dMJe/CnWROoo=";
hash = "sha256-x7UtIfjapSTqSpewLUmF71Dbh5WKg4v+QkEtx0waWH4=";
};
cargoHash = "sha256-ataFb/+gPkOjDZYht/c+A75H/GBSW9toPBRQ6H16U9g=";
cargoHash = "sha256-vHj5ijc1Yk9q1m1w2wsRJq1Zk6BIlX8U5wf9HVifPek=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
pkgs/by-name/ps/pscale/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "pscale";
version = "0.216.0";
version = "0.218.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-4fh8bLuwZgx104sfqraYMdlaqZHLnF7/aH2oU2G7Ej0=";
sha256 = "sha256-9aa/Ly/QGdtgpa+p3RuxdZ/EsV81FNLqLxSWMzY55dM=";
};
vendorHash = "sha256-0SRP995sOLM5FRRWXA/a+7D4v1c53P6VTFk4RSfmOfI=";
vendorHash = "sha256-/BYWAE2VpHy+HTmHOz4GhstcD+Y6R0tjeF9/8+LiZT0=";
ldflags = [
"-s"
pkgs/by-name/ra/railway/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "railway";
version = "3.19.1";
version = "3.20.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = "cli";
rev = "v${version}";
hash = "sha256-eV66O5JG5ME046/1rM9GjF3rWioXq2RspFJxMWf5l/k=";
hash = "sha256-rbgGQrZFytrlEAtyrZlwj/ylNw2rAJ9tfK1NNSaxaT4=";
};
cargoHash = "sha256-p6FZCJ+Uwkf7CLTsVKn4eYGCmgmlzCDpt6tylM5FWzo=";
cargoHash = "sha256-vrQwaLJwhdnbltdLYrOxFbcnbUIPpE1fnN+arAYgZvw=";
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/re/realcugan-ncnn-vulkan/cmakelists.patch
+27
View File
@@ -0,0 +1,27 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dac535d..59f6e5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,20 +62,13 @@ if(USE_SYSTEM_NCNN)
message(STATUS "Using glslang install located at ${GLSLANG_TARGET_DIR}")
find_package(Threads)
+ find_package(glslang REQUIRED)
+ find_package(SPIRV-Tools-opt REQUIRED)
- include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
- include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
# hlsl support can be optional
include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
endif()
- include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
- include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
-
- if (NOT TARGET glslang OR NOT TARGET SPIRV)
- message(WARNING "glslang or SPIRV target not found! USE_SYSTEM_NCNN will be turned off.")
- set(USE_SYSTEM_NCNN OFF)
- endif()
endif()
endif()
pkgs/by-name/re/realcugan-ncnn-vulkan/models_path.patch
+22
View File
@@ -0,0 +1,22 @@
diff --git a/main.cpp b/main.cpp
index bd78c99..75f162f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -109,7 +109,7 @@ static void print_usage()
fprintf(stdout, " -s scale upscale ratio (1/2/3/4, default=2)\n");
fprintf(stdout, " -t tile-size tile size (>=32/0=auto, default=0) can be 0,0,0 for multi-gpu\n");
fprintf(stdout, " -c syncgap-mode sync gap mode (0/1/2/3, default=3)\n");
- fprintf(stdout, " -m model-path realcugan model path (default=models-se)\n");
+ fprintf(stdout, " -m model-path realcugan model path (default=REPLACE_MODELS)\n");
fprintf(stdout, " -g gpu-id gpu device to use (-1=cpu, default=auto) can be 0,1,2 for multi-gpu\n");
fprintf(stdout, " -j load:proc:save thread count for load/proc/save (default=1:2:2) can be 1:2,2,2:2 for multi-gpu\n");
fprintf(stdout, " -x enable tta mode\n");
@@ -442,7 +442,7 @@ int main(int argc, char** argv)
int noise = -1;
int scale = 2;
std::vector<int> tilesize;
- path_t model = PATHSTR("models-se");
+ path_t model = PATHSTR("REPLACE_MODELS");
std::vector<int> gpuid;
int jobs_load = 1;
std::vector<int> jobs_proc;
pkgs/by-name/re/realcugan-ncnn-vulkan/package.nix
+71
View File
@@ -0,0 +1,71 @@
{
lib,
stdenv,
fetchzip,
fetchFromGitHub,
cmake,
vulkan-headers,
vulkan-loader,
glslang,
libwebp,
ncnn,
}:
stdenv.mkDerivation rec {
pname = "realcugan-ncnn-vulkan";
version = "20220728";
src = fetchFromGitHub {
owner = "nihui";
repo = "realcugan-ncnn-vulkan";
rev = version;
hash = "sha256-P3Y1B8m1+mpFinacwnvBE2vU150jj6Q12IS6QYNRZ6A=";
};
sourceRoot = "${src.name}/src";
models = fetchzip {
url = "https://github.com/nihui/realcugan-ncnn-vulkan/releases/download/20220728/realcugan-ncnn-vulkan-20220728-ubuntu.zip";
sha256 = "sha256-71C6taL2Zr1exG5HEXOLy1j9ZMKgkMJjTgNi2hiA7xk=";
};
patches = [
./cmakelists.patch
./models_path.patch
];
cmakeFlags = [
(lib.cmakeBool "USE_SYSTEM_NCNN" true)
(lib.cmakeBool "USE_SYSTEM_WEBP" true)
(lib.cmakeFeature "GLSLANG_TARGET_DIR" "${glslang}/lib/cmake")
];
nativeBuildInputs = [ cmake ];
buildInputs = [
vulkan-headers
vulkan-loader
glslang
libwebp
ncnn
];
postPatch = ''
substituteInPlace main.cpp --replace REPLACE_MODELS $out/share/models-se
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share
cp realcugan-ncnn-vulkan $out/bin/
cp -r ${models}/models-{nose,pro,se} $out/share
runHook postInstall
'';
meta = with lib; {
description = "Real-cugan converter ncnn version, runs fast on intel / amd / nvidia / apple-silicon GPU with vulkan";
homepage = "https://github.com/nihui/realcugan-ncnn-vulkan";
license = licenses.mit;
maintainers = with maintainers; [ iynaix ];
mainProgram = "realcugan-ncnn-vulkan";
platforms = platforms.all;
};
}
pkgs/by-name/rp/rpcs3/package.nix
+4 -4
View File
@@ -34,10 +34,10 @@
let
# Keep these separate so the update script can regex them
rpcs3GitVersion = "17070-8b8396b94";
rpcs3Version = "0.0.33-17070-8b8396b94";
rpcs3Revision = "8b8396b9455394486656660c960d420c5b6c446c";
rpcs3Hash = "sha256-LUgKUzoBNY4ZemRBsLOjtXxLXHyRkPivtdSSgUGw5h4=";
rpcs3GitVersion = "17206-9d4ff13c2";
rpcs3Version = "0.0.34-17206-9d4ff13c2";
rpcs3Revision = "9d4ff13c2bbcb85d8fa63b479d0f4c28f9472147";
rpcs3Hash = "sha256-FZItMeClPxwzwLVH5YPLV7NQZ5kFn6SjdduMI9P2kWQ=";
inherit (qt6Packages)
qtbase
pkgs/by-name/si/signalbackup-tools/package.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20241216";
version = "20241218";
src = fetchFromGitHub {
owner = "bepaald";
repo = "signalbackup-tools";
rev = version;
hash = "sha256-X7fYxCHzhZbJGkUyRZvGFP1ITgrUbG0nOSN2Jz0/aQQ=";
hash = "sha256-51tjKKpcAF8zsIy5clllOBXQabFh4Lcaa1IUic9CmJA=";
};
nativeBuildInputs = [
pkgs/by-name/si/sile/package.nix
+3 -3
View File
@@ -29,17 +29,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sile";
version = "0.15.7";
version = "0.15.8";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.zst";
hash = "sha256-PjU6Qfn+FTL3vt66mkIAn/uXWMPPlH8iK6B264ekIis=";
hash = "sha256-ZMF6uv1bHvMEGagbAAmYhwwbCBtjctVbwx35w7g/D2o=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) pname version src;
nativeBuildInputs = [ zstd ];
hash = "sha256-iPkXEUC4U1m/ComIDo/J5kwkmM1QdowioNtnSnmMhJ0=";
hash = "sha256-xv411fxOkjsbVNCNEIaopjLHbUCWdw+1JWePXHdrKBc=";
};
nativeBuildInputs = [
pkgs/by-name/sr/srm-cuarzo/package.nix
+2 -2
View File
@@ -14,9 +14,9 @@
}:
stdenv.mkDerivation (self: {
pname = "srm-cuarzo";
version = "0.10.0-1";
version = "0.11.0-1";
rev = "v${self.version}";
hash = "sha256-qkJVVoGU07wwcPsrIJi1gkl0uJaZM42kAX8PFQ68HDM=";
hash = "sha256-9fs29Us2/Z6d4u0XHKaFUrjxuSDcp9zj+cyIlhAn0Eg=";
src = fetchFromGitHub {
inherit (self) rev hash;
pkgs/by-name/te/testkube/package.nix
+2 -2
View File
@@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "testkube";
version = "2.1.72";
version = "2.1.79";
src = fetchFromGitHub {
owner = "kubeshop";
repo = "testkube";
rev = "v${version}";
hash = "sha256-qwFq+mw0ry8Xq/iqlM/1CBkKgADqmPf9s7DjoRDULzo=";
hash = "sha256-CG1i+znv30i2FfGr5VeOt0FcvECsWMxsUF6os6KCsmk=";
};
vendorHash = "sha256-i4R3UlH0QmAHva1T5XkKhhOGT7BGZRpLD4jP8Z09IVk=";
pkgs/by-name/tu/tui-journal/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "tui-journal";
version = "0.13.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "AmmarAbouZor";
repo = "tui-journal";
rev = "v${version}";
hash = "sha256-fmkncLmIlvj7TOXIEcB0AXBa3E6kYqJsVCyekWXHPC0=";
hash = "sha256-KPh+ree1XSOdURb+pM0sjJeq3NnNvPOQ+spK4g3RxGM=";
};
cargoHash = "sha256-ewqirDLvsR/FRDUJco4LXPobPtruyYGdbT7qFyithtE=";
cargoHash = "sha256-YiD2MtRMGdzPeKR082n9Kx3OBMFvtcqZOd+HRg7zA5o=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/va/vapoursynth-bestsource/package.nix
+1 -1
View File
@@ -55,6 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
gpl2Plus
];
maintainers = with lib.maintainers; [ snaki ];
platforms = lib.platforms.x86_64;
platforms = lib.platforms.all;
};
})
pkgs/by-name/va/vault-bin/package.nix
+6 -6
View File
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "vault-bin";
version = "1.18.2";
version = "1.18.3";
src =
let
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
aarch64-darwin = "darwin_arm64";
};
hash = selectSystem {
x86_64-linux = "sha256-l1S/E6NYP6fjPcD7CdNlMKQfbrSCtxIsDjiykmu2+Pc=";
aarch64-linux = "sha256-WgsKyrw9AALWVzHTjrleuEk/0BVYk3yF+H4oadU5g7g=";
i686-linux = "sha256-t0O/i/YxT0jTOJRX4YhCHkeSb8iNzD5EgKLAupVyCg4=";
x86_64-darwin = "sha256-1TMZXvx/RmzKJWuLUddKRI9rufqQC9HWVRSclAJZuSI=";
aarch64-darwin = "sha256-Tl+b88RY/Vj3/2KlZmE/uLd7KmGSVMwW0ttmTEvFM2g=";
x86_64-linux = "sha256-pELGadExnOMVC+BZMk6vmth6cN2f0DdVz8gQmaHDv8Y=";
aarch64-linux = "sha256-53LGpPcJUz+1Dw8UKE5tX6VGMJc4LfXw2MaiKKfYbvI=";
i686-linux = "sha256-3SEw3iOEYC/HopzvjJNXgtYZhpSag1lgsmsq7goyZDs=";
x86_64-darwin = "sha256-Bz0mhmFOfJL3m1qX7lmLHNGuZCkyKXu14X523M9Dp0Q=";
aarch64-darwin = "sha256-GM6pN4cngjt7dhF5mNqeoygS4+fkCjsCGyxo/IEaMWs=";
};
in
fetchzip {
pkgs/by-name/va/vault/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "vault";
version = "1.18.2";
version = "1.18.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
hash = "sha256-Y5F1qE1zwiX+2mAYxBpoybIHlFaY62WMg88jrjCVqSc=";
hash = "sha256-DwwKxTjwY6CKN4RPRJFxgdTdGYeG4A7lYk7iZFC9SbY=";
};
vendorHash = "sha256-SSjoaHp6xpz01vtF7mKLNbX/yDS3RXetZzibwI0OCVI=";
vendorHash = "sha256-nrQIlenyXCCfjIyJT6whmWwzUmHl+rwFeyI2LiIxHkk=";
proxyVendor = true;
pkgs/by-name/vr/vrcadvert/package.nix
+21 -3
View File
@@ -3,25 +3,43 @@
dotnetCorePackages,
fetchFromGitHub,
lib,
versionCheckHook,
}:
buildDotnetModule rec {
pname = "VrcAdvert";
pname = "vrcadvert";
version = "1.0.0";
src = fetchFromGitHub {
owner = "galister";
repo = "VrcAdvert";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ=";
};
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
dotnetFlags = [ "-p:RuntimeFrameworkVersion=${dotnet-runtime.version}" ];
nugetDeps = ./deps.json;
executables = [ "VrcAdvert" ];
postPatch = ''
substituteInPlace VrcAdvert.csproj \
--replace-fail 'net6.0' 'net8.0'
substituteInPlace global.json \
--replace-fail '6.0.0' '8.0.0'
'';
doInstallCheck = true;
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/VrcAdvert";
passthru.updateScript = ./update.sh;
meta = {
description = "Advertise your OSC app through OSCQuery";
homepage = "https://github.com/galister/VrcAdvert";
pkgs/by-name/vr/vrcadvert/update.sh
Executable
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env nix-shell
#!nix-shell --pure -i bash -p bash nix nix-update git cacert
set -eo pipefail
prev_version=$(nix eval --raw -f. vrcadvert.version)
nix-update vrcadvert
[[ $(nix eval --raw -f. vrcadvert.version) == "$prev_version" ]] ||
$(nix-build . -A vrcadvert.fetch-deps --no-out-link)
pkgs/by-name/vu/vuls/package.nix
+3 -3
View File
@@ -6,17 +6,17 @@
buildGoModule rec {
pname = "vuls";
version = "0.28.0";
version = "0.28.1";
src = fetchFromGitHub {
owner = "future-architect";
repo = "vuls";
rev = "refs/tags/v${version}";
hash = "sha256-J7kH9XUk+DQmoo5pQd9I0NuGPmR3pYrZ0WG0hKaPFvk=";
hash = "sha256-mrptQSTxTdste6UgbkAm3aqgpYfaoOykHX0eYOTojgA=";
fetchSubmodules = true;
};
vendorHash = "sha256-vrIbD6HB7JikBQZk0rmt5EQxS2JYjQkzFaLYBPvdx+Q=";
vendorHash = "sha256-KufQPVnNRoyaHiuVaVIjwifh5CsoCoF7CrqvBKcG7kA=";
ldflags = [
"-s"
pkgs/by-name/xc/xcp/package.nix
+3 -3
View File
@@ -6,19 +6,19 @@
rustPlatform.buildRustPackage rec {
pname = "xcp";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "tarka";
repo = pname;
rev = "v${version}";
hash = "sha256-3Y8/zRdWD6GSkhp1UabGyDrU62h1ZADYd4D1saED1ug=";
hash = "sha256-W9gSVZcL171ibcBBblQo1+baux78q+ZuGAOC7nAyQ20=";
};
# no such file or directory errors
doCheck = false;
cargoHash = "sha256-08Yw0HOaV8XKwzrODaBcHato6TfKBeVBa55MWzINAE0=";
cargoHash = "sha256-P6A1tO+XlZobvptwfJ4KH6iE/p/T1Md1sOSKZ/H/xt4=";
meta = with lib; {
description = "Extended cp(1)";
pkgs/by-name/yt/ytdl-sub/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
}:
python3Packages.buildPythonApplication rec {
pname = "ytdl-sub";
version = "2024.12.4";
version = "2024.12.14";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "ytdl_sub";
hash = "sha256-8Qd5JQy9tuQoB0W7uBQiWQsRkUmM78UA+1laVaQ6zwU=";
hash = "sha256-kCx/PlCmJesbsMv3bQ0BaTDfskP7XYE69VXdjPNfln4=";
};
pythonRelaxDeps = [
pkgs/development/interpreters/wasmer/default.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "wasmer";
version = "5.0.3";
version = "5.0.4";
src = fetchFromGitHub {
owner = "wasmerio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ZqaEArPnmaVh0fymtYZfxHnt8sm3FXsvc5kHH8GEDxM=";
hash = "sha256-rP0qvSb9PxsTMAq0hpB+zdSTHvridyCVdukLUYxdao8=";
};
cargoHash = "sha256-VCBwj5w7pXc1T+NlLVHTBhcsSRFfaxx9tZk3MFwsze4=";
cargoHash = "sha256-6UwFfTHhAr56K7kDAp0dCSoCjZuCHdgw2bpOD1WdvYU=";
nativeBuildInputs = [
rustPlatform.bindgenHook
pkgs/development/libraries/agda/cubical-mini/default.nix
+43
View File
@@ -0,0 +1,43 @@
{
lib,
mkDerivation,
fetchFromGitHub,
ghc,
cabal-install,
}:
mkDerivation rec {
pname = "cubical-mini";
version = "nightly-20241214";
src = fetchFromGitHub {
repo = pname;
owner = "cmcmA20";
rev = "ab18320018ddc0055db60d4bb5560d31909c5b78";
hash = "sha256-32qXY9KbProdPwqHxSkwO74Oqx65rTzoXtH2SpRB3OM=";
};
nativeBuildInputs = [
ghc
cabal-install
];
# Makefile uses `cabal run` which tries to write its default config to $HOME and download package
# lists. We need to create an empty config file to make cabal work offline.
buildPhase = ''
runHook preBuild
export HOME=$TMP
mkdir $HOME/.cabal
touch $HOME/.cabal/config
make
runHook postBuild
'';
meta = {
homepage = "https://github.com/cmcmA20/cubical-mini";
description = "A nonstandard library for Cubical Agda";
license = lib.licenses.agpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ thelissimus ];
};
}
pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+8 -1
View File
@@ -169,6 +169,13 @@ let
libasi = buildIndi3rdParty {
pname = "libasi";
postPatch = ''
substituteInPlace 99-asi.rules \
--replace-fail "/bin/echo" "${coreutils}/bin/echo" \
--replace-fail "/bin/sh" "${bash}/bin/sh"
'';
buildInputs = [
libusb1
(lib.getLib stdenv.cc.cc)
@@ -344,7 +351,7 @@ let
postPatch = ''
substituteInPlace 99-player_one_astronomy.rules \
--replace-fail "/bin/echo" "${coreutils}/bin/echo" \
--replace "/bin/sh" "${bash}/bin/sh"
--replace-fail "/bin/sh" "${bash}/bin/sh"
'';
buildInputs = [
pkgs/development/ocaml-modules/conduit/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@
buildDunePackage rec {
pname = "conduit";
version = "7.0.0";
version = "7.1.0";
minimalOCamlVersion = "4.13";
src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
hash = "sha256-Pg7ChIlqldF42NE1eS56Rssk+csK8OqWTQXO4avLEhg=";
hash = "sha256-WNIhigfnFwYCXeOMoCUyM+lw81tMrNN/cGlBtMvqV/c=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/async-modbus/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "async-modbus";
version = "0.2.1";
version = "0.2.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "tiagocoutinho";
repo = "async_modbus";
rev = "refs/tags/v${version}";
hash = "sha256-OTt/rUa3KLVSFOIUyMNHnqHvPtISxTposNFAgoixRfk=";
hash = "sha256-xms2OfX5bHPXswwhLhyh6HFsm1YqDwKclUirxrgL4i0=";
};
patches = [
pkgs/development/python-modules/craft-application/default.nix
+2 -2
View File
@@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "craft-application";
version = "4.5.0";
version = "4.6.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-application";
rev = "refs/tags/${version}";
hash = "sha256-uhIJmoh6++hJinSGjwLwSAgVGQp3CENkE1CSL5t1mvI=";
hash = "sha256-kDujv7iVUvPfP9g3Ofm0Vso+I6qKBOq9NlFpigd6+Tc=";
};
postPatch = ''
pkgs/development/python-modules/publicsuffixlist/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "1.0.2.20241217";
version = "1.0.2.20241218";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-c46nDRPvPFSfSfYgEiwxQxHcxXCFMkH11SJ2opod6Ms=";
hash = "sha256-WqTtSeZpCQF0wLf9GwUKbhEf1IusdY9GNh6wYZ+P41E=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/sphinx-intl/default.nix
+3 -3
View File
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "sphinx-intl";
version = "2.3.0";
version = "2.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "sphinx-doc";
repo = "sphinx-intl";
rev = "refs/tags/${version}";
hash = "sha256-j14iZdFBSOHqopJcMYMcQdf3zggRUCzTwcquImhhVpE=";
tag = version;
hash = "sha256-VrWtRdI9j/y2m7kN7/m/5cdxpI0dAaiprdXKt8m6MPc=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1283";
version = "3.0.1284";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-Olk1cRNnRLs71QocjMooLdhtvpBfnG3ZTRvI9Qssxt0=";
hash = "sha256-HPfEP6ZTHX8YIxAalZFmng6fjGtiJyx+jDNWlq8ZKag=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/weblate-language-data/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "weblate-language-data";
version = "2024.14";
version = "2024.15";
pyproject = true;
src = fetchPypi {
pname = "weblate_language_data";
inherit version;
hash = "sha256-Q03gtpdS/CVJusP/A6N3KbfFx/wwHWTlVDraCk6yL/0=";
hash = "sha256-l5ybOv4CCQWO7NnSbymGMJ6I29BFkvTvDC0TpQwU27M=";
};
build-system = [ setuptools ];
pkgs/development/tools/analysis/checkov/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.336";
version = "3.2.342";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-T++J0kRFXV5v7+CCSy5ho5340kYF7mp9Cru8StXx+UQ=";
hash = "sha256-/Cl+n4ctOTGnF/wMZ2a2yBaYpeYhh03I5LO1WGGnqYc=";
};
patches = [ ./flake8-compat-5.x.patch ];
pkgs/os-specific/linux/nvidia-x11/default.nix
+124 -105
View File
@@ -1,21 +1,38 @@
{ lib, callPackage, fetchFromGitHub, fetchgit, fetchpatch, stdenv, pkgsi686Linux }:
{
lib,
callPackage,
fetchFromGitHub,
fetchgit,
fetchpatch,
stdenv,
pkgsi686Linux,
}:
let
generic = args: let
imported = import ./generic.nix args;
in callPackage imported {
lib32 = (pkgsi686Linux.callPackage imported {
libsOnly = true;
kernel = null;
}).out;
};
generic =
args:
let
imported = import ./generic.nix args;
in
callPackage imported {
lib32 =
(pkgsi686Linux.callPackage imported {
libsOnly = true;
kernel = null;
}).out;
};
kernel = callPackage # a hacky way of extracting parameters from callPackage
({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
kernel =
# a hacky way of extracting parameters from callPackage
callPackage (
{
kernel,
libsOnly ? false,
}:
if libsOnly then { } else kernel
) { };
selectHighestVersion = a: b: if lib.versionOlder a.version b.version
then b
else a;
selectHighestVersion = a: b: if lib.versionOlder a.version b.version then b else a;
# https://forums.developer.nvidia.com/t/linux-6-7-3-545-29-06-550-40-07-error-modpost-gpl-incompatible-module-nvidia-ko-uses-gpl-only-symbol-rcu-read-lock/280908/19
rcu_patch = fetchpatch {
@@ -25,7 +42,7 @@ let
# Fixes drm device not working with linux 6.12
# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/712
drm_fop_flags_linux_612_patch = fetchpatch {
drm_fop_flags_linux_612_patch = fetchpatch {
url = "https://github.com/Binary-Eater/open-gpu-kernel-modules/commit/8ac26d3c66ea88b0f80504bdd1e907658b41609d.patch";
hash = "sha256-+SfIu3uYNQCf/KXhv4PWvruTVKQSh4bgU1moePhe57U=";
};
@@ -83,20 +100,7 @@ rec {
};
# data center driver compatible with current default cudaPackages
dc = dc_520;
dc_520 = generic rec {
version = "520.61.05";
url = "https://us.download.nvidia.com/tesla/${version}/NVIDIA-Linux-x86_64-${version}.run";
sha256_64bit = "sha256-EPYWZwOur/6iN/otDMrNDpNXr1mzu8cIqQl8lXhQlzU==";
fabricmanagerSha256 = "sha256-o8Kbmkg7qczKQclaGvEyXNzEOWq9ZpQZn9syeffnEiE==";
useSettings = false;
usePersistenced = false;
useFabricmanager = true;
patches = [ rcu_patch ];
broken = kernel.kernelAtLeast "6.5";
};
dc = dc_565;
dc_535 = generic rec {
version = "535.154.05";
@@ -111,6 +115,17 @@ rec {
patches = [ rcu_patch ];
};
dc_565 = generic rec {
version = "565.57.01";
url = "https://us.download.nvidia.com/tesla/${version}/NVIDIA-Linux-x86_64-${version}.run";
sha256_64bit = "sha256-buvpTlheOF6IBPWnQVLfQUiHv4GcwhvZW3Ks0PsYLHo=";
persistencedSha256 = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg=";
fabricmanagerSha256 = "sha256-umhyehddbQ9+xhhoiKC7SOSVxscA5pcnqvkQOOLIdsM=";
useSettings = false;
usePersistenced = true;
useFabricmanager = true;
};
# Update note:
# If you add a legacy driver here, also update `top-level/linux-kernels.nix`,
# adding to the `nvidia_x11_legacy*` entries.
@@ -136,85 +151,89 @@ rec {
};
# Last one supporting x86
legacy_390 = let
# Source corresponding to https://aur.archlinux.org/packages/nvidia-390xx-dkms
aurPatches = fetchgit {
url = "https://aur.archlinux.org/nvidia-390xx-utils.git";
rev = "ebb48c240ce329e89ad3b59e78c8c708f46f27b3";
hash = "sha256-AGx3/EQ81awBMs6rrXTGWJmyq+UjBCPp6/9z1BQBB9E=";
legacy_390 =
let
# Source corresponding to https://aur.archlinux.org/packages/nvidia-390xx-dkms
aurPatches = fetchgit {
url = "https://aur.archlinux.org/nvidia-390xx-utils.git";
rev = "ebb48c240ce329e89ad3b59e78c8c708f46f27b3";
hash = "sha256-AGx3/EQ81awBMs6rrXTGWJmyq+UjBCPp6/9z1BQBB9E=";
};
patchset = [
"kernel-4.16+-memory-encryption.patch"
"kernel-6.2.patch"
"kernel-6.3.patch"
"kernel-6.4.patch"
"kernel-6.5.patch"
"kernel-6.6.patch"
"kernel-6.8.patch"
"gcc-14.patch"
"kernel-6.10.patch"
];
in
generic {
version = "390.157";
sha256_32bit = "sha256-VdZeCkU5qct5YgDF8Qgv4mP7CVHeqvlqnP/rioD3B5k=";
sha256_64bit = "sha256-W+u8puj+1da52BBw+541HxjtxTSVJVPL3HHo/QubMoo=";
settingsSha256 = "sha256-uJZO4ak/w/yeTQ9QdXJSiaURDLkevlI81de0q4PpFpw=";
persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns=";
patches = map (patch: "${aurPatches}/${patch}") patchset;
broken = kernel.kernelAtLeast "6.11 ";
# fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
# see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
# and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699
postInstall = ''
mv $out/lib/tls/* $out/lib
rmdir $out/lib/tls
'';
};
patchset = [
"kernel-4.16+-memory-encryption.patch"
"kernel-6.2.patch"
"kernel-6.3.patch"
"kernel-6.4.patch"
"kernel-6.5.patch"
"kernel-6.6.patch"
"kernel-6.8.patch"
"gcc-14.patch"
"kernel-6.10.patch"
];
in generic {
version = "390.157";
sha256_32bit = "sha256-VdZeCkU5qct5YgDF8Qgv4mP7CVHeqvlqnP/rioD3B5k=";
sha256_64bit = "sha256-W+u8puj+1da52BBw+541HxjtxTSVJVPL3HHo/QubMoo=";
settingsSha256 = "sha256-uJZO4ak/w/yeTQ9QdXJSiaURDLkevlI81de0q4PpFpw=";
persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns=";
patches = map (patch: "${aurPatches}/${patch}") patchset;
broken = kernel.kernelAtLeast "6.11 ";
legacy_340 =
let
# Source corresponding to https://aur.archlinux.org/packages/nvidia-340xx-dkms
aurPatches = fetchFromGitHub {
owner = "archlinux-jerry";
repo = "nvidia-340xx";
rev = "7616dfed253aa93ca7d2e05caf6f7f332c439c90";
hash = "sha256-1qlYc17aEbLD4W8XXn1qKryBk2ltT6cVIv5zAs0jXZo=";
};
patchset = [
"0001-kernel-5.7.patch"
"0002-kernel-5.8.patch"
"0003-kernel-5.9.patch"
"0004-kernel-5.10.patch"
"0005-kernel-5.11.patch"
"0006-kernel-5.14.patch"
"0007-kernel-5.15.patch"
"0008-kernel-5.16.patch"
"0009-kernel-5.17.patch"
"0010-kernel-5.18.patch"
"0011-kernel-6.0.patch"
"0012-kernel-6.2.patch"
"0013-kernel-6.3.patch"
"0014-kernel-6.5.patch"
"0015-kernel-6.6.patch"
];
in
generic {
version = "340.108";
sha256_32bit = "1jkwa1phf0x4sgw8pvr9d6krmmr3wkgwyygrxhdazwyr2bbalci0";
sha256_64bit = "06xp6c0sa7v1b82gf0pq0i5p0vdhmm3v964v0ypw36y0nzqx8wf6";
settingsSha256 = "0zm29jcf0mp1nykcravnzb5isypm8l8mg2gpsvwxipb7nk1ivy34";
persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn";
useGLVND = false;
# fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
# see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
# and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699
postInstall = ''
mv $out/lib/tls/* $out/lib
rmdir $out/lib/tls
'';
};
broken = kernel.kernelAtLeast "6.7";
patches = map (patch: "${aurPatches}/${patch}") patchset;
legacy_340 = let
# Source corresponding to https://aur.archlinux.org/packages/nvidia-340xx-dkms
aurPatches = fetchFromGitHub {
owner = "archlinux-jerry";
repo = "nvidia-340xx";
rev = "7616dfed253aa93ca7d2e05caf6f7f332c439c90";
hash = "sha256-1qlYc17aEbLD4W8XXn1qKryBk2ltT6cVIv5zAs0jXZo=";
# fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
# see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
# and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699
postInstall = ''
mv $out/lib/tls/* $out/lib
rmdir $out/lib/tls
'';
};
patchset = [
"0001-kernel-5.7.patch"
"0002-kernel-5.8.patch"
"0003-kernel-5.9.patch"
"0004-kernel-5.10.patch"
"0005-kernel-5.11.patch"
"0006-kernel-5.14.patch"
"0007-kernel-5.15.patch"
"0008-kernel-5.16.patch"
"0009-kernel-5.17.patch"
"0010-kernel-5.18.patch"
"0011-kernel-6.0.patch"
"0012-kernel-6.2.patch"
"0013-kernel-6.3.patch"
"0014-kernel-6.5.patch"
"0015-kernel-6.6.patch"
];
in generic {
version = "340.108";
sha256_32bit = "1jkwa1phf0x4sgw8pvr9d6krmmr3wkgwyygrxhdazwyr2bbalci0";
sha256_64bit = "06xp6c0sa7v1b82gf0pq0i5p0vdhmm3v964v0ypw36y0nzqx8wf6";
settingsSha256 = "0zm29jcf0mp1nykcravnzb5isypm8l8mg2gpsvwxipb7nk1ivy34";
persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn";
useGLVND = false;
broken = kernel.kernelAtLeast "6.7";
patches = map (patch: "${aurPatches}/${patch}") patchset;
# fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
# see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
# and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699
postInstall = ''
mv $out/lib/tls/* $out/lib
rmdir $out/lib/tls
'';
};
}
pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
+22 -5
View File
@@ -5,12 +5,15 @@ nvidia_x11: sha256:
lib,
fetchurl,
patchelf,
zlib,
glibc,
}:
let
sys = lib.concatStringsSep "-" (lib.reverseList (lib.splitString "-" stdenv.system));
bsys = builtins.replaceStrings [ "_" ] [ "-" ] sys;
fmver = nvidia_x11.version;
ldd = (lib.getBin glibc) + "/bin/ldd";
in
stdenv.mkDerivation rec {
@@ -23,14 +26,23 @@ stdenv.mkDerivation rec {
inherit sha256;
};
phases = [
"unpackPhase"
"installPhase"
];
installPhase = ''
mkdir -p $out/{bin,share/nvidia-fabricmanager}
for bin in nv{-fabricmanager,switch-audit};do
${patchelf}/bin/patchelf \
--set-interpreter ${stdenv.cc.libc}/lib/ld-${bsys}.so.2 \
--set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc ]} \
--shrink-rpath \
bin/$bin
${patchelf}/bin/patchelf \
--set-interpreter ${stdenv.cc.libc}/lib/ld-${bsys}.so.2 \
--set-rpath ${
lib.makeLibraryPath [
stdenv.cc.libc
zlib
]
} \
bin/$bin
done
mv bin/nv{-fabricmanager,switch-audit} $out/bin/.
for d in etc systemd share/nvidia;do
@@ -39,6 +51,11 @@ stdenv.mkDerivation rec {
for d in include lib;do
mv $d $out/.
done
patchShebangs $out/bin
for b in $out/bin/*;do
${ldd} $b | grep -vqz "not found"
done
'';
meta = {
pkgs/os-specific/linux/nvidia-x11/generic.nix
+188 -131
View File
@@ -1,65 +1,67 @@
{ version
, url ? null
, sha256_32bit ? null
, sha256_64bit
, sha256_aarch64 ? null
, openSha256 ? null
, settingsSha256 ? null
, settingsVersion ? version
, persistencedSha256 ? null
, persistencedVersion ? version
, fabricmanagerSha256 ? null
, fabricmanagerVersion ? version
, useGLVND ? true
, useProfiles ? true
, preferGtk2 ? false
, settings32Bit ? false
, useSettings ? true
, usePersistenced ? true
, useFabricmanager ? false
, ibtSupport ? false
{
version,
url ? null,
sha256_32bit ? null,
sha256_64bit,
sha256_aarch64 ? null,
openSha256 ? null,
settingsSha256 ? null,
settingsVersion ? version,
persistencedSha256 ? null,
persistencedVersion ? version,
fabricmanagerSha256 ? null,
fabricmanagerVersion ? version,
useGLVND ? true,
useProfiles ? true,
preferGtk2 ? false,
settings32Bit ? false,
useSettings ? true,
usePersistenced ? true,
useFabricmanager ? false,
ibtSupport ? false,
, prePatch ? null
, postPatch ? null
, patchFlags ? null
, patches ? [ ]
, patchesOpen ? [ ]
, preInstall ? null
, postInstall ? null
, broken ? false
, brokenOpen ? broken
prePatch ? null,
postPatch ? null,
patchFlags ? null,
patches ? [ ],
patchesOpen ? [ ],
preInstall ? null,
postInstall ? null,
broken ? false,
brokenOpen ? broken,
}@args:
{ lib
, stdenv
, runCommandLocal
, patchutils
, callPackage
, pkgs
, pkgsi686Linux
, fetchurl
, fetchzip
, kernel ? null
, perl
, nukeReferences
, which
, libarchive
, jq
, # Whether to build the libraries only (i.e. not the kernel module or
{
lib,
stdenv,
runCommandLocal,
patchutils,
callPackage,
pkgs,
pkgsi686Linux,
fetchurl,
fetchzip,
kernel ? null,
perl,
nukeReferences,
which,
libarchive,
jq,
# Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux.
libsOnly ? false
, # don't include the bundled 32-bit libraries on 64-bit platforms,
libsOnly ? false,
# don't include the bundled 32-bit libraries on 64-bit platforms,
# even if it’s in downloaded binary
disable32Bit ? stdenv.hostPlatform.system == "aarch64-linux"
disable32Bit ? stdenv.hostPlatform.system == "aarch64-linux",
# 32 bit libs only version of this package
, lib32 ? null
lib32 ? null,
# Whether to extract the GSP firmware, datacenter drivers needs to extract the
# firmware
, firmware ? openSha256 != null || useFabricmanager
firmware ? openSha256 != null || useFabricmanager,
# Whether the user accepts the NVIDIA Software License
, config
, acceptLicense ? config.nvidia.acceptLicense or false
config,
acceptLicense ? config.nvidia.acceptLicense or false,
}:
assert !libsOnly -> kernel != null;
@@ -97,21 +99,26 @@ let
pkgSuffix = lib.optionalString (lib.versionOlder version "304") "-pkg0";
i686bundled = lib.versionAtLeast version "391" && !disable32Bit;
libPathFor = pkgs: lib.makeLibraryPath (with pkgs; [
libdrm
xorg.libXext
xorg.libX11
xorg.libXv
xorg.libXrandr
xorg.libxcb
zlib
stdenv.cc.cc
wayland
libgbm
libGL
openssl
dbus # for nvidia-powerd
]);
libPathFor =
pkgs:
lib.makeLibraryPath (
with pkgs;
[
libdrm
xorg.libXext
xorg.libX11
xorg.libXv
xorg.libXrandr
xorg.libxcb
zlib
stdenv.cc.cc
wayland
libgbm
libGL
openssl
dbus # for nvidia-powerd
]
);
# maybe silly since we've ignored this previously and just unfree..
throwLicense = throw ''
@@ -139,35 +146,46 @@ let
builder = ./builder.sh;
src =
if !acceptLicense && (openSha256 == null) then throwLicense else
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl
{
urls = if args ? url then [ args.url ] else [
"https://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"
"https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"
];
sha256 = sha256_64bit;
}
if !acceptLicense && (openSha256 == null) then
throwLicense
else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
urls =
if args ? url then
[ args.url ]
else
[
"https://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"
"https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"
];
sha256 = sha256_64bit;
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl
{
urls = if args ? url then [ args.url ] else [
"https://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"
"https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"
];
sha256 = sha256_32bit;
}
fetchurl {
urls =
if args ? url then
[ args.url ]
else
[
"https://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"
"https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"
];
sha256 = sha256_32bit;
}
else if stdenv.hostPlatform.system == "aarch64-linux" && sha256_aarch64 != null then
fetchurl
{
urls = if args ? url then [ args.url ] else [
"https://us.download.nvidia.com/XFree86/aarch64/${version}/NVIDIA-Linux-aarch64-${version}${pkgSuffix}.run"
"https://download.nvidia.com/XFree86/Linux-aarch64/${version}/NVIDIA-Linux-aarch64-${version}${pkgSuffix}.run"
];
sha256 = sha256_aarch64;
}
else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";
fetchurl {
urls =
if args ? url then
[ args.url ]
else
[
"https://us.download.nvidia.com/XFree86/aarch64/${version}/NVIDIA-Linux-aarch64-${version}${pkgSuffix}.run"
"https://download.nvidia.com/XFree86/Linux-aarch64/${version}/NVIDIA-Linux-aarch64-${version}${pkgSuffix}.run"
];
sha256 = sha256_aarch64;
}
else
throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";
patches =
if libsOnly then
@@ -186,7 +204,8 @@ let
inherit (stdenv.hostPlatform) system;
inherit i686bundled;
outputs = [ "out" ]
outputs =
[ "out" ]
++ lib.optional i686bundled "lib32"
++ lib.optional (!libsOnly) "bin"
++ lib.optional (!libsOnly && firmware) "firmware";
@@ -195,14 +214,20 @@ let
kernel = if libsOnly then null else kernel.dev;
kernelVersion = if libsOnly then null else kernel.modDirVersion;
makeFlags = lib.optionals (!libsOnly) (kernel.makeFlags ++ [
"IGNORE_PREEMPT_RT_PRESENCE=1"
"NV_BUILD_SUPPORTS_HMM=1"
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
]);
makeFlags = lib.optionals (!libsOnly) (
kernel.makeFlags
++ [
"IGNORE_PREEMPT_RT_PRESENCE=1"
"NV_BUILD_SUPPORTS_HMM=1"
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
]
);
hardeningDisable = [ "pic" "format" ];
hardeningDisable = [
"pic"
"format"
];
dontStrip = true;
dontPatchELF = true;
@@ -210,31 +235,50 @@ let
libPath = libPathFor pkgs;
libPath32 = lib.optionalString i686bundled (libPathFor pkgsi686Linux);
nativeBuildInputs = [ perl nukeReferences which libarchive jq ]
++ lib.optionals (!libsOnly) kernel.moduleBuildDependencies;
nativeBuildInputs = [
perl
nukeReferences
which
libarchive
jq
] ++ lib.optionals (!libsOnly) kernel.moduleBuildDependencies;
disallowedReferences = lib.optionals (!libsOnly) [ kernel.dev ];
passthru =
let
fetchFromGithubOrNvidia = { owner, repo, rev, ... }@args:
fetchFromGithubOrNvidia =
{
owner,
repo,
rev,
...
}@args:
let
args' = builtins.removeAttrs args [ "owner" "repo" "rev" ];
args' = builtins.removeAttrs args [
"owner"
"repo"
"rev"
];
baseUrl = "https://github.com/${owner}/${repo}";
in
fetchzip (args' // {
urls = [
"${baseUrl}/archive/${rev}.tar.gz"
"https://download.nvidia.com/XFree86/${repo}/${repo}-${rev}.tar.bz2"
];
# github and nvidia use different compression algorithms,
# use an invalid file extension to force detection.
extension = "tar.??";
});
fetchzip (
args'
// {
urls = [
"${baseUrl}/archive/${rev}.tar.gz"
"https://download.nvidia.com/XFree86/${repo}/${repo}-${rev}.tar.bz2"
];
# github and nvidia use different compression algorithms,
# use an invalid file extension to force detection.
extension = "tar.??";
}
);
in
{
open = lib.mapNullable
(hash: callPackage ./open.nix {
open = lib.mapNullable (
hash:
callPackage ./open.nix {
inherit hash;
nvidia_x11 = self;
patches =
@@ -244,43 +288,56 @@ let
}) patches)
++ patchesOpen;
broken = brokenOpen;
})
openSha256;
}
) openSha256;
settings =
if useSettings then
(if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256)
(if settings32Bit then pkgsi686Linux.callPackage else callPackage)
(import ./settings.nix self settingsSha256)
{
withGtk2 = preferGtk2;
withGtk3 = !preferGtk2;
fetchFromGitHub = fetchFromGithubOrNvidia;
} else { };
}
else
{ };
persistenced =
if usePersistenced then
lib.mapNullable
(hash: callPackage (import ./persistenced.nix self hash) {
lib.mapNullable (
hash:
callPackage (import ./persistenced.nix self hash) {
fetchFromGitHub = fetchFromGithubOrNvidia;
})
persistencedSha256
else { };
}
) persistencedSha256
else
{ };
fabricmanager =
if useFabricmanager then
lib.mapNullable (hash: callPackage (import ./fabricmanager.nix self hash) { }) fabricmanagerSha256
else { };
else
{ };
inherit persistencedVersion settingsVersion;
compressFirmware = false;
ibtSupport = ibtSupport || (lib.versionAtLeast version "530");
} // lib.optionalAttrs (!i686bundled) {
}
// lib.optionalAttrs (!i686bundled) {
inherit lib32;
};
meta = with lib; {
homepage = "https://www.nvidia.com/object/unix.html";
description = "${if useFabricmanager then "Data Center" else "X.org"} driver and kernel module for NVIDIA cards";
description = "${
if useFabricmanager then "Data Center" else "X.org"
} driver and kernel module for NVIDIA cards";
license = licenses.unfreeRedistributable;
platforms = [ "x86_64-linux" ]
platforms =
[ "x86_64-linux" ]
++ lib.optionals (sha256_32bit != null) [ "i686-linux" ]
++ lib.optionals (sha256_aarch64 != null) [ "aarch64-linux" ];
maintainers = with maintainers; [ kiskae edwtjo ];
maintainers = with maintainers; [
kiskae
edwtjo
];
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
inherit broken;
};
pkgs/os-specific/linux/nvidia-x11/open.nix
+52 -41
View File
@@ -1,49 +1,60 @@
{ stdenv
, lib
, fetchFromGitHub
, kernel
, nvidia_x11
, hash
, patches ? [ ]
, broken ? false
{
stdenv,
lib,
fetchFromGitHub,
kernel,
nvidia_x11,
hash,
patches ? [ ],
broken ? false,
}:
stdenv.mkDerivation ({
pname = "nvidia-open";
version = "${kernel.version}-${nvidia_x11.version}";
stdenv.mkDerivation (
{
pname = "nvidia-open";
version = "${kernel.version}-${nvidia_x11.version}";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "open-gpu-kernel-modules";
rev = nvidia_x11.version;
inherit hash;
};
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "open-gpu-kernel-modules";
rev = nvidia_x11.version;
inherit hash;
};
inherit patches;
inherit patches;
nativeBuildInputs = kernel.moduleBuildDependencies;
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
{
aarch64-linux = "TARGET_ARCH=aarch64";
x86_64-linux = "TARGET_ARCH=x86_64";
}.${stdenv.hostPlatform.system}
];
makeFlags = kernel.makeFlags ++ [
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
{
aarch64-linux = "TARGET_ARCH=aarch64";
x86_64-linux = "TARGET_ARCH=x86_64";
}
.${stdenv.hostPlatform.system}
];
installTargets = [ "modules_install" ];
enableParallelBuilding = true;
installTargets = [ "modules_install" ];
enableParallelBuilding = true;
meta = with lib; {
description = "NVIDIA Linux Open GPU Kernel Module";
homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
license = with licenses; [ gpl2Plus mit ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ nickcao ];
inherit broken;
};
} // lib.optionalAttrs stdenv.hostPlatform.isAarch64 {
env.NIX_CFLAGS_COMPILE = "-fno-stack-protector";
})
meta = with lib; {
description = "NVIDIA Linux Open GPU Kernel Module";
homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
license = with licenses; [
gpl2Plus
mit
];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
maintainers = with maintainers; [ nickcao ];
inherit broken;
};
}
// lib.optionalAttrs stdenv.hostPlatform.isAarch64 {
env.NIX_CFLAGS_COMPILE = "-fno-stack-protector";
}
)
pkgs/os-specific/linux/nvidia-x11/settings.nix
+92 -57
View File
@@ -1,27 +1,28 @@
nvidia_x11: sha256:
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, pkg-config
, m4
, jansson
, gtk2
, dbus
, vulkan-headers
, gtk3
, libXv
, libXrandr
, libXext
, libXxf86vm
, libvdpau
, librsvg
, libglvnd
, wrapGAppsHook3
, addDriverRunpath
, withGtk2 ? false
, withGtk3 ? true
{
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
pkg-config,
m4,
jansson,
gtk2,
dbus,
vulkan-headers,
gtk3,
libXv,
libXrandr,
libXext,
libXxf86vm,
libvdpau,
librsvg,
libglvnd,
wrapGAppsHook3,
addDriverRunpath,
withGtk2 ? false,
withGtk3 ? true,
}:
let
@@ -35,7 +36,10 @@ let
meta = with lib; {
homepage = "https://www.nvidia.com/object/unix.html";
platforms = nvidia_x11.meta.platforms;
maintainers = with maintainers; [ abbradar aidalgol ];
maintainers = with maintainers; [
abbradar
aidalgol
];
};
libXNVCtrl = stdenv.mkDerivation {
@@ -43,7 +47,10 @@ let
version = nvidia_x11.settingsVersion;
inherit src;
buildInputs = [ libXrandr libXext ];
buildInputs = [
libXrandr
libXext
];
preBuild = ''
cd src/libXNVCtrl
@@ -57,8 +64,12 @@ let
patches = [
# Patch the Makefile to also produce a shared library.
(if lib.versionOlder nvidia_x11.settingsVersion "400" then ./libxnvctrl-build-shared-3xx.patch
else ./libxnvctrl-build-shared.patch)
(
if lib.versionOlder nvidia_x11.settingsVersion "400" then
./libxnvctrl-build-shared-3xx.patch
else
./libxnvctrl-build-shared.patch
)
];
installPhase = ''
@@ -79,7 +90,9 @@ let
};
runtimeDependencies = [
libglvnd libXrandr libXv
libglvnd
libXrandr
libXv
];
runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
@@ -92,20 +105,22 @@ stdenv.mkDerivation {
inherit src;
patches = lib.optional (lib.versionOlder nvidia_x11.settingsVersion "440")
(fetchpatch {
patches =
lib.optional (lib.versionOlder nvidia_x11.settingsVersion "440") (fetchpatch {
# fixes "multiple definition of `VDPAUDeviceFunctions'" linking errors
url = "https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d85d59934bd0cf6b6.patch";
hash = "sha256-ZwF3dRTYt/hO8ELg9weoz1U/XcU93qiJL2d1aq1Jlak=";
})
++ lib.optional
((lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04")
&& (lib.versionOlder nvidia_x11.settingsVersion "545.29"))
(fetchpatch {
# fix wayland support for compositors that use wl_output version 4
url = "https://github.com/NVIDIA/nvidia-settings/pull/99/commits/2e0575197e2b3247deafd2a48f45afc038939a06.patch";
hash = "sha256-wKuO5CUTUuwYvsP46Pz+6fI0yxLNpZv8qlbL0TFkEFE=";
});
++ lib.optional
(
(lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04")
&& (lib.versionOlder nvidia_x11.settingsVersion "545.29")
)
(fetchpatch {
# fix wayland support for compositors that use wl_output version 4
url = "https://github.com/NVIDIA/nvidia-settings/pull/99/commits/2e0575197e2b3247deafd2a48f45afc038939a06.patch";
hash = "sha256-wKuO5CUTUuwYvsP46Pz+6fI0yxLNpZv8qlbL0TFkEFE=";
});
postPatch = lib.optionalString nvidia_x11.useProfiles ''
sed -i 's,/usr/share/nvidia/,${nvidia_x11.bin}/share/nvidia/,g' src/gtk+-2.x/ctkappprofile.c
@@ -122,31 +137,51 @@ stdenv.mkDerivation {
fi
'';
nativeBuildInputs = [ pkg-config m4 addDriverRunpath ]
++ lib.optionals withGtk3 [ wrapGAppsHook3 ];
nativeBuildInputs = [
pkg-config
m4
addDriverRunpath
] ++ lib.optionals withGtk3 [ wrapGAppsHook3 ];
buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 dbus vulkan-headers ]
buildInputs =
[
jansson
libXv
libXrandr
libXext
libXxf86vm
libvdpau
nvidia_x11
dbus
vulkan-headers
]
++ lib.optionals (withGtk2 || lib.versionOlder nvidia_x11.settingsVersion "525.53") [ gtk2 ]
++ lib.optionals withGtk3 [ gtk3 librsvg ];
++ lib.optionals withGtk3 [
gtk3
librsvg
];
installFlags = [ "PREFIX=$(out)" ];
postInstall = lib.optionalString (!withGtk2) ''
rm -f $out/lib/libnvidia-gtk2.so.*
'' + lib.optionalString (!withGtk3) ''
rm -f $out/lib/libnvidia-gtk3.so.*
'' + ''
# Install the desktop file and icon.
# The template has substitution variables intended to be replaced resulting
# in absolute paths. Because absolute paths break after the desktop file is
# copied by a desktop environment, make Exec and Icon be just a name.
sed -i doc/nvidia-settings.desktop \
-e "s|^Exec=.*$|Exec=nvidia-settings|" \
-e "s|^Icon=.*$|Icon=nvidia-settings|" \
-e "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings|g"
install doc/nvidia-settings.desktop -D -t $out/share/applications/
install doc/nvidia-settings.png -D -t $out/share/icons/hicolor/128x128/apps/
'';
postInstall =
lib.optionalString (!withGtk2) ''
rm -f $out/lib/libnvidia-gtk2.so.*
''
+ lib.optionalString (!withGtk3) ''
rm -f $out/lib/libnvidia-gtk3.so.*
''
+ ''
# Install the desktop file and icon.
# The template has substitution variables intended to be replaced resulting
# in absolute paths. Because absolute paths break after the desktop file is
# copied by a desktop environment, make Exec and Icon be just a name.
sed -i doc/nvidia-settings.desktop \
-e "s|^Exec=.*$|Exec=nvidia-settings|" \
-e "s|^Icon=.*$|Icon=nvidia-settings|" \
-e "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings|g"
install doc/nvidia-settings.desktop -D -t $out/share/applications/
install doc/nvidia-settings.png -D -t $out/share/icons/hicolor/128x128/apps/
'';
binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings";
postFixup = ''
pkgs/tools/misc/esphome/dashboard.nix
+3 -3
View File
@@ -13,19 +13,19 @@
buildPythonPackage rec {
pname = "esphome-dashboard";
version = "20241120.0";
version = "20241217.1";
pyproject = true;
src = fetchFromGitHub {
owner = "esphome";
repo = "dashboard";
rev = "refs/tags/${version}";
hash = "sha256-insoDWHqMFAGgmsY2ZgNuo1cl0WGJXRy398bt3ADORs=";
hash = "sha256-Mirihvts8G2D4e5Jn7S0dWEJ+sOHZ+fvzsNaLpAOyMA=";
};
npmDeps = fetchNpmDeps {
inherit src;
hash = "sha256-UKrF7yzyj09WBrmrJ6uzcRjIYrKwCqLQ5paiqnt/Xuc=";
hash = "sha256-fWQvDMeuRjyToHhhZH1KtLWuhgAvq900cCja2dvLQyU=";
};
build-system = [ setuptools ];
pkgs/tools/misc/esphome/default.nix
+4 -9
View File
@@ -22,14 +22,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2024.11.3";
version = "2024.12.1";
pyproject = true;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ZGqYvbNBQSoU6F20Bdzif8zmzLPr4XusVVrOR0iWl7k=";
hash = "sha256-XWjWmp5lfdyJxD8dPCFq3HbcCzfAtTyzpOSa+IjUNm0=";
};
build-systems = with python.pkgs; [
@@ -55,20 +55,15 @@ python.pkgs.buildPythonApplication rec {
# ensure component dependencies are available
cat requirements_optional.txt >> requirements.txt
# relax strict runtime version check
substituteInPlace esphome/components/font/__init__.py \
--replace-fail "10.4.0" "${python.pkgs.pillow.version}"
'';
# Remove esptool and platformio from requirements
env.ESPHOME_USE_SUBPROCESS = "";
# esphome has optional dependencies it does not declare, they are
# loaded when certain config blocks are used, like `font`, `image`
# or `animation`.
# loaded when certain config blocks are used.
# They have validation functions like:
# - validate_cryptography_installed
# - validate_pillow_installed
# - validate_cryptography_installed for the wifi component
dependencies = with python.pkgs; [
aioesphomeapi
argcomplete
pkgs/top-level/agda-packages.nix
+2
View File
@@ -40,6 +40,8 @@ let
cubical = callPackage ../development/libraries/agda/cubical { };
cubical-mini = callPackage ../development/libraries/agda/cubical-mini { };
functional-linear-algebra = callPackage ../development/libraries/agda/functional-linear-algebra { };
generic = callPackage ../development/libraries/agda/generic { };
pkgs/top-level/all-packages.nix
-1
View File
@@ -925,7 +925,6 @@ with pkgs;
};
aegisub = callPackage ../by-name/ae/aegisub/package.nix ({
boost = boost179;
luajit = luajit.override { enable52Compat = true; };
wxGTK = wxGTK32;
} // (config.aegisub or {}));
pkgs/top-level/linux-kernels.nix
+1 -1
View File
@@ -430,8 +430,8 @@ in {
nvidia_x11_production = nvidiaPackages.production;
nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta;
nvidia_dc = nvidiaPackages.dc;
nvidia_dc_520 = nvidiaPackages.dc_520;
nvidia_dc_535 = nvidiaPackages.dc_535;
nvidia_dc_565 = nvidiaPackages.dc_565;
# this is not a replacement for nvidia_x11*
# only the opensource kernel driver exposed for hydra to build