mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-17 12:50:04 +00:00
Merge master into staging-nixos
This commit is contained in:
@@ -195,6 +195,11 @@ let
|
||||
error_log ${cfg.logError};
|
||||
daemon off;
|
||||
|
||||
# load_module is a main-context directive that must precede events{}/http{}.
|
||||
${optionalString (
|
||||
(cfg.package.dynamicModules or [ ]) != [ ]
|
||||
) "include ${cfg.package}/etc/nginx/dynamic-modules.conf;"}
|
||||
|
||||
${optionalString cfg.enableQuicBPF ''
|
||||
quic_bpf on;
|
||||
''}
|
||||
|
||||
@@ -1242,6 +1242,7 @@ in
|
||||
nginx = runTest ./nginx.nix;
|
||||
nginx-auth = runTest ./nginx-auth.nix;
|
||||
nginx-compression = runTest ./nginx-compression.nix;
|
||||
nginx-dynamic-modules = runTest ./nginx-dynamic-modules.nix;
|
||||
nginx-etag = runTest ./nginx-etag.nix;
|
||||
nginx-etag-compression = runTest ./nginx-etag-compression.nix;
|
||||
nginx-globalredirect = runTest ./nginx-globalredirect.nix;
|
||||
|
||||
32
nixos/tests/nginx-dynamic-modules.nix
Normal file
32
nixos/tests/nginx-dynamic-modules.nix
Normal file
@@ -0,0 +1,32 @@
|
||||
{
|
||||
name = "nginx-dynamic-modules";
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
additionalModules = [ (pkgs.nginxModules.echo // { dynamic = true; }) ];
|
||||
virtualHosts."localhost".locations."/".extraConfig = ''
|
||||
echo "dynamic-module-ok";
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
let
|
||||
cfg = nodes.machine.services.nginx;
|
||||
in
|
||||
''
|
||||
machine.wait_for_unit("nginx")
|
||||
machine.wait_for_open_port(80)
|
||||
|
||||
machine.succeed("ls ${cfg.package}/modules/*.so")
|
||||
machine.succeed("grep -F load_module ${cfg.package}/etc/nginx/dynamic-modules.conf")
|
||||
|
||||
# The echo directive only exists once nginx has dlopen'd the .so.
|
||||
response = machine.wait_until_succeeds("curl -fsS http://127.0.0.1/")
|
||||
assert "dynamic-module-ok" in response, response
|
||||
'';
|
||||
}
|
||||
@@ -52,16 +52,28 @@
|
||||
machine.screenshot("Repath-Studio-GUI-Welcome")
|
||||
machine.send_key("kp_enter") # OK
|
||||
|
||||
# sleep is required it needs time to dismiss the dialog
|
||||
# move the mouse to the "Save" icon on the toolbar
|
||||
machine.execute("su - alice -c \"DISPLAY=:0 xdotool mousemove --sync 95 65\"")
|
||||
|
||||
# click the save icon until the GTK save dialog appears
|
||||
for _ in range(30):
|
||||
status, _ = machine.execute("su - alice -c \"DISPLAY=:0 xdotool search --name 'Save File'\"")
|
||||
if status == 0:
|
||||
break
|
||||
machine.execute("su - alice -c \"DISPLAY=:0 xdotool click 1\"")
|
||||
machine.sleep(1)
|
||||
|
||||
# wait for the GTK dialog to focus the text input field
|
||||
machine.sleep(3)
|
||||
machine.send_chars("saved.rps") # avoid using absolute path here, doesn't work for some reason
|
||||
# wait for text to be typed
|
||||
machine.sleep(2)
|
||||
machine.send_key("ctrl-shift-s")
|
||||
machine.sleep(2)
|
||||
machine.send_chars("/tmp/saved.rps")
|
||||
machine.sleep(2)
|
||||
machine.succeed("su - alice -c 'DISPLAY=:0 xdotool mousemove --sync 975 745 click 1'") # Save file dialog
|
||||
machine.sleep(2)
|
||||
print(machine.succeed("cat /tmp/saved.rps"))
|
||||
assert "${pkgs.repath-studio.version}" in machine.succeed("cat /tmp/saved.rps")
|
||||
|
||||
machine.execute("su - alice -c \"DISPLAY=:0 xdotool key alt+s\"") # save file
|
||||
machine.wait_until_succeeds("ls /home/alice/saved.rps")
|
||||
|
||||
machine.succeed("cat /home/alice/saved.rps")
|
||||
assert "${pkgs.repath-studio.version}" in machine.succeed("cat /home/alice/saved.rps")
|
||||
|
||||
machine.screenshot("Repath-Studio-GUI")
|
||||
'';
|
||||
|
||||
@@ -11,14 +11,17 @@
|
||||
{
|
||||
applytransforms = callPackage ./extensions/applytransforms { };
|
||||
|
||||
hexmap = stdenv.mkDerivation {
|
||||
hexmap = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hexmap";
|
||||
version = "unstable-2023-01-26";
|
||||
version = "3.0pre2";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lifelike";
|
||||
repo = "hexmapextension";
|
||||
rev = "241c9512d0113e8193b7cf06b69ef2c4730b0295";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-pSPAupp3xLlbODE2BGu1Xiiiu1Y6D4gG4HhZwccAZ2E=";
|
||||
};
|
||||
|
||||
@@ -41,7 +44,7 @@
|
||||
maintainers = [ lib.maintainers.raboof ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
};
|
||||
});
|
||||
inkcut = (
|
||||
runCommand "inkcut-inkscape-plugin" { } ''
|
||||
mkdir -p $out/share/inkscape/extensions
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
binaryName = "firefox-beta";
|
||||
version = "156.0b2";
|
||||
version = "156.0b4";
|
||||
applicationName = "Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "5b685f8b947af0b519c59a308fba6a41f9481df68b7fb6f4b395707653c3ef1822817d2f867d663081cd2d61c8fd4537f46b8002da84b5efa9b8a57ae9491164";
|
||||
sha512 = "2aa751d66854145bf260dd04fe1473ca20275c02e51c07efdda769d7980cdaee6dc393cac32fe3bb4ed131249fde81e150c284ee38af5fc560da7704947a6453";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
(buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
binaryName = "firefox-devedition";
|
||||
version = "156.0b2";
|
||||
version = "156.0b4";
|
||||
applicationName = "Firefox Developer Edition";
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "683326ff4367f9b807c4c5b93f100970258ada9838da2c597358105a99ff4aa7e33269fe67d6c68d466e2f539d2bea3015457109516af19e1785588ce43426b5";
|
||||
sha512 = "5ebdcd33004516625f90f1862b66198e80b906074371cfa2be22e44666fecbe5f93301290427f2860b45a94918d645ae0a26eed32c78b46136c745b1dcf89a1b";
|
||||
};
|
||||
|
||||
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "ansible-doctor";
|
||||
version = "8.4.0";
|
||||
version = "8.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1O6F7MNNdt8WX+NAqJD1ZNToB6PrfWKtoweT5Pbl9l8=";
|
||||
hash = "sha256-q9KYsZnfCNyHWnu7hSn/6FUza+CWb/7X8HhqDatjtr4=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "betula";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~bouncepaw";
|
||||
repo = "betula";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cZ7xMtJ6I1lvWllwdNSFzeUsvGXWJnUtUR4iPn3oosc=";
|
||||
hash = "sha256-P7d8qVvZQCkqavgkyJOY5WuwMzg1lURzWKt71XzThpg=";
|
||||
};
|
||||
vendorHash = "sha256-HGjaS2Sqsjk/pilt8wtx5Ect8Y8S5638PWEpXCqeZ6w=";
|
||||
|
||||
|
||||
@@ -1,26 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
blas,
|
||||
config,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
cmake,
|
||||
eigen,
|
||||
cudaPackages,
|
||||
|
||||
# buildInputs
|
||||
gflags,
|
||||
|
||||
# propagatedBuildInputs
|
||||
eigen,
|
||||
glog,
|
||||
suitesparse,
|
||||
blas,
|
||||
metis,
|
||||
runTests ? false,
|
||||
suitesparse,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
|
||||
enableStatic ? stdenv.hostPlatform.isStatic,
|
||||
withBlas ? true,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
let
|
||||
effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv;
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ceres-solver";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ceres-solver.org/ceres-solver-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-SLIwKnmG7OFyiYR3w7zW3rj7XPGbMye8SZaarUzt6C0=";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ceres-solver";
|
||||
repo = "ceres-solver";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5SdHXcgwTlkDIUuyOQgD8JlAElk7aEWcFo/nyeOgN/k=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -28,20 +47,49 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"dev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = lib.optional runTests gflags;
|
||||
# https://github.com/ceres-solver/ceres-solver/blob/85331393dc0dff09f6fb9903ab0c4bfa3e134b01/CMakeLists.txt#L251-L252
|
||||
postPatch = lib.optionalString cudaSupport ''
|
||||
nixLog "patching $PWD/CMakeLists.txt to remove hardcoded CUDA architectures"
|
||||
substituteInPlace "$PWD/CMakeLists.txt" \
|
||||
--replace-fail \
|
||||
'set(CMAKE_CUDA_ARCHITECTURES' \
|
||||
'# set(CMAKE_CUDA_ARCHITECTURES'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
lib.optionals finalAttrs.doCheck [
|
||||
gflags
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_cudart
|
||||
cudaPackages.libcublas
|
||||
cudaPackages.libcusolver
|
||||
cudaPackages.libcusparse
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
eigen
|
||||
glog
|
||||
]
|
||||
++ lib.optionals withBlas [
|
||||
blas
|
||||
suitesparse
|
||||
metis
|
||||
suitesparse
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}"
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!enableStatic))
|
||||
(lib.cmakeBool "USE_CUDA" cudaSupport)
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
|
||||
];
|
||||
|
||||
# The Basel BUILD file conflicts with the cmake build directory on
|
||||
@@ -50,14 +98,39 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm BUILD
|
||||
'';
|
||||
|
||||
doCheck = runTests;
|
||||
|
||||
doCheck = false;
|
||||
checkTarget = "test";
|
||||
|
||||
preCheck =
|
||||
let
|
||||
skippedTests = lib.concatStringsSep ":" [
|
||||
# Failing (with more or less consistency) due to floating-point tolerance issues.
|
||||
# Upstream issue: https://github.com/ceres-solver/ceres-solver/issues/1062
|
||||
"Polynomial.NullPointerAsImaginaryPartWorks"
|
||||
"Polynomial.PolynomialNullPointerAsImaginaryPartWorks"
|
||||
"Polynomial.QuarticPolynomialWithTwoClustersOfCloseRootsWorks"
|
||||
"Polynomial.QuarticPolynomialWithTwoZeroRootsWorks"
|
||||
"Polynomial.QuarticPolynomialWorks"
|
||||
];
|
||||
in
|
||||
''
|
||||
export GTEST_FILTER="-${skippedTests}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.withTests = finalAttrs.finalPackage.overrideAttrs {
|
||||
doCheck = true;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "C++ library for modeling and solving large, complicated optimization problems";
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "http://ceres-solver.org";
|
||||
downloadPage = "https://github.com/ceres-solver/ceres-solver";
|
||||
teams = [ lib.teams.cuda ];
|
||||
maintainers = with lib.maintainers; [ giogadi ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "clipman";
|
||||
version = "1.6.5";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = "clipman";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-fAiXivLXpxezvMUKv0HfDvzSN60G4RFfgi6/fO0C1p8=";
|
||||
sha256 = "sha256-bee40nTmFMhWeP9vC7PTRQUZ/5OLZ4CtC5LlVBbfeNQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QD/ucnIqPHgKaYRmBO4fwDVqC7kKlYmBaZp3XBWudy0=";
|
||||
vendorHash = "sha256-I31qF84k1r/xpROW9sZ5rs7lGAxwgqXUEQ9EEo8vsTY=";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "code";
|
||||
version = "0.6.171";
|
||||
version = "0.6.181";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "just-every";
|
||||
repo = "code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cMqfmo1HtCyB9tNpGLXa80Gwt00enVzTS3MeEQ/J5VA=";
|
||||
hash = "sha256-9ubp+PJVkV6wCb/2t7nkuFq7Iho+dlyNHwMCjXetOOU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/code-rs";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gh-review-conductor";
|
||||
version = "1.3.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gh-tui-tools";
|
||||
repo = "gh-review-conductor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gNQmO+Sa9n+hfy5CBSPqSXhHTzZz8D1sLrNqs+z9Rx4=";
|
||||
hash = "sha256-B6wjZoBGltfb/qsApzoPPFG1w1f7AyuCAvQVSVtkX4M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xAOTSdyNRZDKDPnCrvaepBOTDrnHLEA53K5TBxkqbDM=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gilt-rs";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonhollingshead";
|
||||
repo = "gilt-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rW5uHRqGq8CBl+4eZo/1W0T7km+mRI2oFN0FU30To8Q=";
|
||||
hash = "sha256-kGmHf+knEurVTz7K7MtDkDFWIDs8nIp4CrsBHwnjg6s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oVHNBg6umFsPWBVIZEMBc6AB1SFqHMAxwuTa3cIyKjE=";
|
||||
cargoHash = "sha256-4YlfR2ft5D910IKSDx/3PxrwFLln2dqscdVg+OhnSYk=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
||||
@@ -24,12 +24,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpu-screen-recorder-gtk";
|
||||
version = "5.8.0";
|
||||
version = "5.8.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zpMIyOnRP2TBudb4ipalG3NbJKchkz2Hzf2T9oqzgfI=";
|
||||
hash = "sha256-LOaHYk7c8USZz5p17YdzcgGJ+FZkEt1qn15VggnQyJQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hanko";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SRv6d";
|
||||
repo = "hanko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tmspfsIIxYa9fTPhHJrVRUcpC8gZ0R4prTLTDstuwbg=";
|
||||
hash = "sha256-raQl8inNOO9pRQnlESrQ5dSbQG7uC3LtQIv8AOqD+e0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IcQtG29qTQl4U0HwG+kvPT07RhSgUADtejV7ObWyjG0=";
|
||||
cargoHash = "sha256-EuYJX1Ds4Kq2Vka5gDnFHRHl3F20xMDm2XgYy4+FZXE=";
|
||||
|
||||
# Upstream tests require network access, which is unavailable in the sandbox.
|
||||
doCheck = false;
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "homer";
|
||||
version = "26.08.2";
|
||||
version = "26.08.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bastienwirtz";
|
||||
repo = "homer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0C7SFjdGJuv/eNEymbpLw7Rd+5k8GxGh67nwhtGG8V4=";
|
||||
hash = "sha256-25XQH6Kn+ydtUUKiIlQQ1WEBXfljkams+yyCht/bLQ8=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-z9rR5o+f+ASvjRa8vPEBeJZHsfuLntNSHQHIt/DW39k=";
|
||||
hash = "sha256-CpwZYUNZVPTQqEPbH7AqwqkKeA+vLpr7AKr3JfPJYxc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -28,7 +28,10 @@ in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "i3-layout-manager";
|
||||
version = "unstable-2020-05-04";
|
||||
version = "0-unstable-2020-05-03";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaxalk";
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "i3-swallow";
|
||||
version = "unstable-2022-02-19";
|
||||
version = "0-unstable-2022-02-18";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
|
||||
@@ -9,19 +9,23 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "iannix";
|
||||
version = "unstable-2020-12-09";
|
||||
version = "0.9.20-b-unstable-2020-12-09";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buzzinglight";
|
||||
repo = "IanniX";
|
||||
rev = "287b51d9b90b3e16ae206c0c4292599619f7b159";
|
||||
sha256 = "AhoP+Ok78Vk8Aee/RP572hJeM8O7v2ZTvFalOZZqRy8=";
|
||||
hash = "sha256-AhoP+Ok78Vk8Aee/RP572hJeM8O7v2ZTvFalOZZqRy8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qtscript
|
||||
];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
||||
@@ -19,7 +19,10 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "in-formant";
|
||||
version = "unstable-2022-09-15";
|
||||
version = "3.1.2-unstable-2022-09-15";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "in-formant";
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "4.17.1";
|
||||
version = "4.19.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-6wz6o7HX7cRp6nC/cTh5FdLNuDUdjmhzts0+qedP/eY=";
|
||||
hash = "sha256-8D2ErfvFQTuRUdodo7CjhQwVsvz5qfmlzs3LpPEG8+M=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lint-staged";
|
||||
version = "17.4.1";
|
||||
version = "17.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lint-staged";
|
||||
repo = "lint-staged";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q8aChdTJTYN5UrYhmGvAz7vcIHTI/M1raCUS2ejd+SU=";
|
||||
hash = "sha256-kRQDWJyyRFNxrdndOs2YYWetihwu+skTOCZ/dw5TzLs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-hJVc7t9UateaSjmN6WIiRbmofvy++23x2oqAEf5Lofw=";
|
||||
npmDepsHash = "sha256-4yMbJFVgcVoo9AWEfJI+OfBoE4Y35rUnjFKuZ9g56/o=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPackages,
|
||||
autoAddDriverRunpath,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
@@ -81,6 +82,8 @@ let
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
buildCc = buildPackages.stdenv.cc;
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
@@ -120,6 +123,11 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
shaderc
|
||||
];
|
||||
|
||||
depsBuildBuild = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
# llama-ui-embed under tools/ui needs a host compiler
|
||||
buildCc
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
optionals cudaSupport cudaBuildInputs
|
||||
++ optionals openclSupport [ clblast ]
|
||||
@@ -185,6 +193,9 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
++ optionals metalSupport [
|
||||
(cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
|
||||
(cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true)
|
||||
]
|
||||
++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
(cmakeFeature "HOST_CXX_COMPILER" (lib.getExe' buildCc "${buildCc.targetPrefix}c++"))
|
||||
];
|
||||
|
||||
postInstall = optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mago";
|
||||
version = "1.47.5";
|
||||
version = "1.47.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carthage-software";
|
||||
repo = "mago";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-IUz1BrwJnx+VXq89YbuN6kR7CzCZzkTOG1pQQ9+NpA4=";
|
||||
hash = "sha256-stb+grYjtflzM90qCK8S/uIQVnOuenhIsQlN+zBhm0g=";
|
||||
forceFetchGit = true; # Does not download all files otherwise
|
||||
};
|
||||
|
||||
cargoHash = "sha256-r9YgTFIBa3HoKEpDH3SLqmXLLd5HNPCznf/mo1si2rw=";
|
||||
cargoHash = "sha256-f+EjMcImL5hwN06/hUn0Y3jlk1vxcxqqNwyrpGxL3T8=";
|
||||
|
||||
env = {
|
||||
# Get openssl-sys to use pkg-config
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mapserver";
|
||||
version = "8.6.5";
|
||||
version = "8.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MapServer";
|
||||
repo = "MapServer";
|
||||
rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
|
||||
hash = "sha256-HEQ+bBb6cXXqR+4Yw5H+3xwQMQvlv0LjlBRT0baFeZQ=";
|
||||
hash = "sha256-Mur8yflPhegMxuq10yygT/a0TfFjdV20D4UM4m8Ffpk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGo127Module (finalAttrs: {
|
||||
pname = "nerva";
|
||||
version = "1.69.5";
|
||||
version = "1.69.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praetorian-inc";
|
||||
repo = "nerva";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WYALn0wf9djDjOT2w94OEj5lTjD42BhnIe3DzmCfbik=";
|
||||
hash = "sha256-HyV9/3nd/WW+kYq243wG/ByVjA01wDsi8IZ6LNdpKR8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0Io4otRsVndfpF+lV+siLDZLf6rsxsczngSYz3exmxM=";
|
||||
|
||||
@@ -111,12 +111,12 @@ let
|
||||
# vendored in-tree. Pre-stage the pin (tracks upstream's
|
||||
# `LLAMA_CPP_VERSION` file) so the FetchContent step uses our copy
|
||||
# instead of trying to clone over the network in the sandbox.
|
||||
llamaCppVersion = "b10630";
|
||||
llamaCppVersion = "b10760";
|
||||
llamaCppSrc = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = llamaCppVersion;
|
||||
hash = "sha256-h7D/vn/tu2DyzvqhJauWJ+a2TMcjnW527Gv28YrB80I=";
|
||||
hash = "sha256-+WI/1TAJWG1m9ttS2RO43C+1oL/5xpZTaHn7vQh4+kc=";
|
||||
};
|
||||
|
||||
wrapperOptions = [
|
||||
@@ -152,16 +152,16 @@ let
|
||||
in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
version = "0.33.1";
|
||||
version = "0.33.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-63Zjqaw+c+8ppShhy4vnJofjG1WzVLIUq7JgO+4eehY=";
|
||||
hash = "sha256-ipmDW1tMxbQsAOKfDPU0wRqvI7w7Mfv4ucr2sCw47w0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HMwoaFBMbpoy8f0I+O+i7kIa9BslLu3FcVWeaIOkpvs=";
|
||||
vendorHash = "sha256-RxmV/VgCydZRGfhWoxDUo3lw8ujCnfQiB1o7PcIikLw=";
|
||||
proxyVendor = true;
|
||||
|
||||
env =
|
||||
|
||||
23
pkgs/by-name/re/repath-studio/fix-karma-sandbox.patch
Normal file
23
pkgs/by-name/re/repath-studio/fix-karma-sandbox.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
--- a/karma.conf.js
|
||||
+++ b/karma.conf.js
|
||||
@@ -7,7 +7,7 @@
|
||||
customLaunchers: {
|
||||
ChromeHeadlessNoSandbox: {
|
||||
base: 'ChromeHeadless',
|
||||
- flags: ['--no-sandbox']
|
||||
+ flags: ['--no-sandbox', '--disable-dev-shm-usage']
|
||||
},
|
||||
CustomElectron: {
|
||||
base: 'Electron',
|
||||
@@ -42,6 +42,10 @@
|
||||
outputDir: junitOutputDir + '/karma', // results will be saved as outputDir/browserName.xml
|
||||
outputFile: undefined, // if included, results will be saved as outputDir/browserName/outputFile
|
||||
suite: '' // suite will become the package name attribute in xml testsuite element
|
||||
- }
|
||||
+ },
|
||||
+
|
||||
+ browserDisconnectTimeout: 300000,
|
||||
+ browserNoActivityTimeout: 300000,
|
||||
+ pingTimeout: 300000
|
||||
})
|
||||
}
|
||||
@@ -36,6 +36,8 @@ buildNpmPackage (finalAttrs: {
|
||||
# outputHash of clojureHome changes each time `clojure` is updated
|
||||
# https://github.com/ngi-nix/ngipkgs/pull/1727#discussion_r2470180998
|
||||
./pin-clojure.patch
|
||||
# checks have become flaky in nix build sandbox, increase timeout and disable dev/shm for chrome
|
||||
./fix-karma-sandbox.patch
|
||||
./0001-disable-auto-update-check.patch
|
||||
];
|
||||
|
||||
|
||||
40
pkgs/by-name/rh/rhuffle/package.nix
Normal file
40
pkgs/by-name/rh/rhuffle/package.nix
Normal file
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
gitMinimal,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rhuffle";
|
||||
version = "0.4.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ctylim";
|
||||
repo = "rhuffle";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-daA5MzSCtBe8NK5tvCv6GjrkjdQtHMUsDyuC2Jisb9Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SMGT/vfU6rVluRQm1ztFP3OJz853XQZhn+eB3TbniKo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
gitMinimal
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Line shuffler for huge text file which does not fit in memory";
|
||||
homepage = "https://github.com/ctylim/rhuffle";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
mainProgram = "rhuffle";
|
||||
};
|
||||
})
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "seaweedfs";
|
||||
version = "4.44";
|
||||
version = "4.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaweedfs";
|
||||
@@ -22,10 +22,10 @@ buildGoModule (finalAttrs: {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
popd
|
||||
'';
|
||||
hash = "sha256-tpLZGPkNlT2sK+l0Ny5VLCL+563J9KZ87Hr7IZTt6Rg=";
|
||||
hash = "sha256-7RSTQcBp94+ySbN0MQpTljf8cJ74OTlCH6jCcOTXfns=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-srMT+bfW11J3pnN8CWm3rrUAL+usHBy8EoHgzq/9J2w=";
|
||||
vendorHash = "sha256-jq7GjP+P9ghVA9V/bHoL4KErbpABZp/ewSS1rNUdeqU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
callPackage ../generic.nix rec {
|
||||
pname = "rat-king-adventure";
|
||||
version = "2.2.3";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TrashboxBobylev";
|
||||
repo = "Rat-King-Adventure";
|
||||
rev = version;
|
||||
hash = "sha256-6KmJRcYUjEdFym8nkCtg841CyKKYV1gACMJv/zOQ2Oc=";
|
||||
hash = "sha256-iGlTDSoXvn1m7avLOBbqPjlEkCoHSL/FtWCyR6IRwM0=";
|
||||
};
|
||||
|
||||
desktopName = "Rat King Adventure";
|
||||
|
||||
@@ -1,30 +1,6 @@
|
||||
{
|
||||
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
|
||||
"!version": 1,
|
||||
"https://central.sonatype.com/repository/maven-snapshots/com/badlogicgames": {
|
||||
"gdx-controllers#gdx-controllers-core/2.2.4-20250608.150029-6/SNAPSHOT": {
|
||||
"jar": "sha256-fyJB8353OKQAxuBSQxgK9TIvX7C36c0r6+WinDfHajw=",
|
||||
"module": "sha256-4aW8P+W7M9gQic97kWSAOEUNvlRXAB72YIt26pshIYQ=",
|
||||
"pom": "sha256-NiKnqhpzSHduvXygZKdClHu4YUjUf536KP1JX6GpTM0="
|
||||
},
|
||||
"gdx-controllers#gdx-controllers-desktop/2.2.4-20250608.150029-6/SNAPSHOT": {
|
||||
"jar": "sha256-kfZsNO7OdEBFqREJcvBk4dVTtvXSYLdl6Yuo52atuDs=",
|
||||
"module": "sha256-VPLkp7CdM0QXhekrmM0KrBCc/r3ILIwkv2OyGzRBUlQ=",
|
||||
"pom": "sha256-HLPRBZpoTtJuJr/CZrFRzY42npXROrwYzDSIyPCoNJk="
|
||||
},
|
||||
"gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": {
|
||||
"xml": {
|
||||
"groupId": "com.badlogicgames.gdx-controllers",
|
||||
"lastUpdated": "20250608150029"
|
||||
}
|
||||
},
|
||||
"gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": {
|
||||
"xml": {
|
||||
"groupId": "com.badlogicgames.gdx-controllers",
|
||||
"lastUpdated": "20250608150029"
|
||||
}
|
||||
}
|
||||
},
|
||||
"https://repo.maven.apache.org/maven2": {
|
||||
"com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": {
|
||||
"jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=",
|
||||
@@ -58,6 +34,16 @@
|
||||
"module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=",
|
||||
"pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY="
|
||||
},
|
||||
"com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.4": {
|
||||
"jar": "sha256-BNpnYnsaNkbvjyFMkdKWdCp8BVl9vCFnqqsJy9zHdHA=",
|
||||
"module": "sha256-dxOP5TsOdeRf4dOROsublicWFxCuVPJUR0sizmp6pIA=",
|
||||
"pom": "sha256-k7HO3nAet8GNZfFei7eds5zzGk6u5pMceIl84NgOMlQ="
|
||||
},
|
||||
"com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.4": {
|
||||
"jar": "sha256-jjkOWcYhHtI+Cm/UAYzvo3+LmGXe5pmVaZBTSWuAHWw=",
|
||||
"module": "sha256-zhrDRlPnkWGq8Nycm+vdDb1zQW0pHSz8ljavonod9mU=",
|
||||
"pom": "sha256-2pO01ZTa8EMd+Q7bPPEOHjpGnCgCDHZb5P+fYKD6bTY="
|
||||
},
|
||||
"com/badlogicgames/jamepad#jamepad/2.26.5.0": {
|
||||
"jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=",
|
||||
"module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=",
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
callPackage ../generic.nix rec {
|
||||
pname = "tower-pixel-dungeon";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FixAkaTheFix";
|
||||
repo = "Tower-Pixel-Dungeon";
|
||||
tag = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}";
|
||||
hash = "sha256-/s+3FarO1iSW7f6SMkVxb9OSSEgVpM3gFUWFd+orcp4=";
|
||||
hash = "sha256-GwHBNWEKkdfcfen/SpK0GtHDUGeB2M1IQben9LtQhFM=";
|
||||
};
|
||||
|
||||
sourceRoot = src.name + "/pixel-towers-master";
|
||||
|
||||
@@ -1,65 +1,6 @@
|
||||
{
|
||||
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
|
||||
"!version": 1,
|
||||
"https://central.sonatype.com/repository/maven-snapshots/com/badlogicgames": {
|
||||
"gdx#gdx-backend-lwjgl3/1.13.6-20251016.105554-34/SNAPSHOT": {
|
||||
"jar": "sha256-unqPp0fol5ow2OPp46AmljGbt/b/zaDG8AP2QcKrVjU=",
|
||||
"module": "sha256-3lbjdtsywfNKS5fxEeIEh8f8EunPNrEHieih8rqJXpE=",
|
||||
"pom": "sha256-P7DA/UDAWmA+/t4H3EJkktKK/e9+pX0gH4fpljqZXWQ="
|
||||
},
|
||||
"gdx#gdx-freetype-platform/1.13.6-20251016.105554-35/SNAPSHOT": {
|
||||
"pom": "sha256-kTnggHqjEcoBlUTM+K15WHCqKodiKvGPrgnTHuTKU4o="
|
||||
},
|
||||
"gdx#gdx-freetype-platform/1.13.6-20251016.105554-35/SNAPSHOT/natives-desktop": {
|
||||
"jar": "sha256-TJvhHfQ9qRTZCDnOvymAn4PXmS6CziqEKN7yv5ioIQU="
|
||||
},
|
||||
"gdx#gdx-freetype/1.13.6-20251016.105554-35/SNAPSHOT": {
|
||||
"jar": "sha256-qZWM1tkaKatC6U1h/Jgo9fV6/Six9XOuNU4qpVYhzsg=",
|
||||
"module": "sha256-tyz5DG0UTrK0tt4ZK1BgJb35T5EBuNpj1gZLe6zoCTI=",
|
||||
"pom": "sha256-wi92v9kAtTv++AZjKT3wJYBeISF98NLNy26X9kEVFSk="
|
||||
},
|
||||
"gdx#gdx-platform/1.13.6-20251016.105554-34/SNAPSHOT": {
|
||||
"pom": "sha256-UW0w1+UTHDD4HaYruY6QVmd/ur/0vHS4wYDZ5hDCEuQ="
|
||||
},
|
||||
"gdx#gdx-platform/1.13.6-20251016.105554-34/SNAPSHOT/natives-desktop": {
|
||||
"jar": "sha256-hCVxiuw/clRgnObDu+eM/OhDnTXEHhVt/gUmHTyzcgU="
|
||||
},
|
||||
"gdx#gdx/1.13.6-20251016.105554-34/SNAPSHOT": {
|
||||
"jar": "sha256-40W5tyVSTXgmSdHtQQoll9OiGhDLhDqRPPWjrrspunM=",
|
||||
"module": "sha256-4xOqM5QcQy7HCliD3TZNk+QvjI0FWI62x1pKpRNzwVs=",
|
||||
"pom": "sha256-aDtJJZT/VHJyxd5RKFrQbc32IFT2wk9R7LeDvhBt8v4="
|
||||
},
|
||||
"gdx/gdx-backend-lwjgl3/1.13.6-SNAPSHOT/maven-metadata": {
|
||||
"xml": {
|
||||
"groupId": "com.badlogicgames.gdx",
|
||||
"lastUpdated": "20251017222916"
|
||||
}
|
||||
},
|
||||
"gdx/gdx-freetype-platform/1.13.6-SNAPSHOT/maven-metadata": {
|
||||
"xml": {
|
||||
"groupId": "com.badlogicgames.gdx",
|
||||
"lastUpdated": "20251212063147"
|
||||
}
|
||||
},
|
||||
"gdx/gdx-freetype/1.13.6-SNAPSHOT/maven-metadata": {
|
||||
"xml": {
|
||||
"groupId": "com.badlogicgames.gdx",
|
||||
"lastUpdated": "20251017222931"
|
||||
}
|
||||
},
|
||||
"gdx/gdx-platform/1.13.6-SNAPSHOT/maven-metadata": {
|
||||
"xml": {
|
||||
"groupId": "com.badlogicgames.gdx",
|
||||
"lastUpdated": "20251218070227"
|
||||
}
|
||||
},
|
||||
"gdx/gdx/1.13.6-SNAPSHOT/maven-metadata": {
|
||||
"xml": {
|
||||
"groupId": "com.badlogicgames.gdx",
|
||||
"lastUpdated": "20251017222908"
|
||||
}
|
||||
}
|
||||
},
|
||||
"https://plugins.gradle.org/m2/org": {
|
||||
"beryx#badass-runtime-plugin/1.12.7": {
|
||||
"jar": "sha256-N3Mx2VyxIFb6U6Qt9/RfF4svqG1sWF9w74TRIz0RB0U=",
|
||||
@@ -100,11 +41,38 @@
|
||||
}
|
||||
},
|
||||
"https://repo.maven.apache.org/maven2": {
|
||||
"com/badlogicgames/gdx#gdx-backend-lwjgl3/1.14.0": {
|
||||
"jar": "sha256-3pV68nyhyv+3eO2hqNMbmDXcc/AEcB0WduyjOWMHICA=",
|
||||
"module": "sha256-GJYW7PSrxbXLJMt1Xwc+IsogkUv4ojCdFdJ/fnpoyOU=",
|
||||
"pom": "sha256-S+xaAWtXxkg0Rruzr4XV0V9f4gedhSpnTcVLMOWd9pY="
|
||||
},
|
||||
"com/badlogicgames/gdx#gdx-freetype-platform/1.14.0": {
|
||||
"pom": "sha256-qQmd0nb4AW2O5i/+TUneaeGohmjS2crXrGc7PvSbKM0="
|
||||
},
|
||||
"com/badlogicgames/gdx#gdx-freetype-platform/1.14.0/natives-desktop": {
|
||||
"jar": "sha256-SFwrJdkZBLlBQ0Bm+BAgBpJHMMLCONBIcq5goC63Ofc="
|
||||
},
|
||||
"com/badlogicgames/gdx#gdx-freetype/1.14.0": {
|
||||
"jar": "sha256-Pr/nUymeEYNLyIzzxMDCzIucJDWsA+VgsKh2QlZYK7Q=",
|
||||
"module": "sha256-fUf8X7lgc5I5ddUqrgMuACcJ144JKU/wOK6K3R7W44A=",
|
||||
"pom": "sha256-Rtq9qlQ6ZRDgUGOMNmphRdkGkbIaBiEf+rSbICMyQiw="
|
||||
},
|
||||
"com/badlogicgames/gdx#gdx-jnigen-loader/2.5.2": {
|
||||
"jar": "sha256-34HyPP1nhcUtNeEI7qo5MPVZ1NJ3CmEC51ynv6b58no=",
|
||||
"module": "sha256-jwtii5G9Ez24XxUuFZMprPf0tmeDvR32AcNZfcJRIiQ=",
|
||||
"pom": "sha256-i0dgu2bbPz+ZuEBj7z6ZDWOhzZx81XSlatf07kvRdoc="
|
||||
},
|
||||
"com/badlogicgames/gdx#gdx-platform/1.14.0": {
|
||||
"pom": "sha256-2Ps74A82eRr6thqFkeVCr7qkkQEHoFdUnMlwBu2NoRs="
|
||||
},
|
||||
"com/badlogicgames/gdx#gdx-platform/1.14.0/natives-desktop": {
|
||||
"jar": "sha256-qKjJzM9endUYJWs8315raJpdaWoU4EYK9bDLxR218vE="
|
||||
},
|
||||
"com/badlogicgames/gdx#gdx/1.14.0": {
|
||||
"jar": "sha256-owWJXpFfxfWUg95dOZokoMpi/hFQFf/oIQw249ZPgSY=",
|
||||
"module": "sha256-xJCoyufsdrraEiLaEyJl5fqyyyzc3q51IXrIhkmUWyU=",
|
||||
"pom": "sha256-CiUFNinRwfRgZMN7orOC0MRmQstKTssVF3jbNXEKmgw="
|
||||
},
|
||||
"com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.4": {
|
||||
"jar": "sha256-BNpnYnsaNkbvjyFMkdKWdCp8BVl9vCFnqqsJy9zHdHA=",
|
||||
"module": "sha256-dxOP5TsOdeRf4dOROsublicWFxCuVPJUR0sizmp6pIA=",
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "symfony-cli";
|
||||
version = "5.19.0";
|
||||
vendorHash = "sha256-/geZVen7WP60LV7+CVv0W8vhiHOoQJmC2WPAXHAc0qY=";
|
||||
version = "5.20.0";
|
||||
vendorHash = "sha256-YFcv+lmD8TZUsN2zYK1usfuLVqzGYdsJ+ScDRcpSORs=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symfony-cli";
|
||||
repo = "symfony-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8AMH4w8V232vbCHzVWbbSNljMA808+Vvu5u0YkiZPIA=";
|
||||
hash = "sha256-NrkD+Upv8PaeaVEQUEVVl2e8jKSr3qoro7fB6MkA95w=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "talosctl";
|
||||
version = "1.13.9";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-I+FygHLeNQKy0OV6yaWMbVwJ/TxLl8KCncX2ICulCbU=";
|
||||
hash = "sha256-zKxP5IM0/c4ntbujIYYe91r7VfdoolHWs/CdkYOOLJU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ep24y1ehD1s5/6uxiufwvTKt4XBp/GmrDE2xnTuVIK8=";
|
||||
vendorHash = "sha256-XBqBYg+/yGECsHsmZuJzliyUVcWoby/IHs2WBaMw9jo=";
|
||||
|
||||
postPatch = lib.optionalString withQemu ''
|
||||
substituteInPlace pkg/provision/providers/qemu/arch.go \
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "temporal-cli";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OBdWQLPFvXAsbjNv/Tq+75IUl31XVtpgJVCQdHQqdBw=";
|
||||
hash = "sha256-4+DvAUQC+iW+GuvTNBDvr9rJDQ0bXZvkO9XhZPYYQsw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9lO9uhy1n85QYyoh27cKhdlcuL4GT98aCNWwe8tOwoQ=";
|
||||
vendorHash = "sha256-h2HSuVQTdLxatLObbNHCjP2qHNE9Qy/4U1MZ0G7HCNY=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tlsx";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -17,10 +17,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "projectdiscovery";
|
||||
repo = "tlsx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3klBmWQfp8PLF4/8bZjHCk+4hiUXX3E+izIfDG2FMfU=";
|
||||
hash = "sha256-mr9eMFgbc8RmuADnBERxiGQ3CIq5vt3JOZ2Di1cwtW8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5zqiA4Aoc5qjxXf8q+IzJqycSv49hJfynAVQ5Yomrro=";
|
||||
vendorHash = "sha256-stTcRPCddn2S65F/QPBZdvoe56hPji1FxrIAMGW34z0=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20260705030346";
|
||||
version = "20260906035830";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-OA3OSniSHqbov8LcojKxyqepvPCLCAdQaU5ha8hKMZU=";
|
||||
hash = "sha256-kwn7Ge9tfcYBGR3ngEvzJa0Pl0yz9su8LxppTPdAL6s=";
|
||||
};
|
||||
vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk=";
|
||||
vendorHash = "sha256-GwZTwdgAMGgsrpCzrqbaRjZEeDUPSHRwXHDaKDCu3Fw=";
|
||||
meta = {
|
||||
description = "Community managed domain list";
|
||||
homepage = "https://github.com/v2fly/domain-list-community";
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "vja";
|
||||
version = "6.0.2";
|
||||
version = "6.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ce72";
|
||||
repo = "vja";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XtZQO1yo8iULM6Kz120BrwBm4u7YDcmNxY2c05ZeSUQ=";
|
||||
hash = "sha256-wyKhDwqQXDU+DaVJo0LCyK1KV1vkRPbrUDs46x7hBEI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wappalyzergo";
|
||||
version = "0.2.95";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "wappalyzergo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0fODuH2JIA8kJHbrqBhHiLdnzAZeGlX9RHD5Qb64p5c=";
|
||||
hash = "sha256-ZkLdT1PdlVQ/oHDV8LTvqkjr/nVHg1PpLRdSfAjMqaE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KicCQ184+ybGcxTdOjVpgxZ4XzELvVqLyJJXIdiImII=";
|
||||
vendorHash = "sha256-KLU2L8aVcEge/LPcAKlAMQJ8cS7GRZ68s/s8zdYWT4M=";
|
||||
|
||||
ldflags = [ "-s" ];
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
cmake,
|
||||
cudatoolkit,
|
||||
fetchFromGitHub,
|
||||
gfortran,
|
||||
lib,
|
||||
@@ -17,6 +16,7 @@
|
||||
enableOpenMP ? true,
|
||||
enablePython ? true,
|
||||
enableUtilities ? true,
|
||||
versionCheckHook,
|
||||
}@inputs:
|
||||
|
||||
let
|
||||
@@ -29,6 +29,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.0.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LLNL";
|
||||
@@ -43,19 +44,21 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
./python312.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
]
|
||||
++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]
|
||||
++ lib.optionals enableFortran [ gfortran ]
|
||||
++ lib.optionals enablePython (
|
||||
with python3Packages;
|
||||
[
|
||||
cython
|
||||
numpy
|
||||
python
|
||||
]
|
||||
);
|
||||
|
||||
buildInputs =
|
||||
lib.optionals enableCuda [ cudatoolkit ]
|
||||
++ lib.optionals enableFortran [ gfortran ]
|
||||
++ lib.optionals enablePython (
|
||||
with python3Packages;
|
||||
[
|
||||
cython
|
||||
numpy
|
||||
python
|
||||
]
|
||||
);
|
||||
buildInputs = lib.optionals enableCuda [ cudaPackages.cuda_cudart ];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (enableOpenMP && effectiveStdenv.cc.isClang) [
|
||||
llvmPackages.openmp
|
||||
@@ -96,6 +99,9 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
"ARGS=\"--exclude-regex testzfp\""
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.tests = {
|
||||
cmake-config = testers.hasCmakeConfigModules {
|
||||
moduleNames = [ "zfp" ];
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiovodafone";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chemelli74";
|
||||
repo = "aiovodafone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9VYFs1cDct/8VNZxm7M6Lo9BLX6Ehdbyj9vC5FygXWE=";
|
||||
hash = "sha256-7m22ALnuLKScbsG7BdiyehEU2VjalGy3DhCvwDUMA5w=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cyclopts";
|
||||
version = "4.24.0";
|
||||
version = "4.25.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BrianPugh";
|
||||
repo = "cyclopts";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2+UcktWF5/E+fcGRmxTz6ef3oT9vUixC5jLNn4QQFMM=";
|
||||
hash = "sha256-SdI2xoPyLf3g+9zhGVyZIzGFwbezMku5l3h7SqeR79k=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "rich-rst" ];
|
||||
|
||||
@@ -26,7 +26,7 @@ let
|
||||
inherit (cudaPackages.flags) dropDots;
|
||||
in
|
||||
buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "flash-attention";
|
||||
pname = "flash-attn";
|
||||
version = "2.8.3.post1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "frigidaire";
|
||||
version = "0.18.50";
|
||||
version = "0.18.53";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bm1549";
|
||||
repo = "frigidaire";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-y48pONTQGpu2B+N3wAyu7tU0GqytZ+HDs1xqYrG4jQU=";
|
||||
hash = "sha256-HwBaFIledBesjxO3sSZ7nk6DoW5Nfq8Ncmb0NUlcMDY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202609071";
|
||||
version = "0.1.202609081";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YjKAmVIVIxjPVyWR4ViDN9/fSqCAgT9IfeaVztJaWjw=";
|
||||
hash = "sha256-pxzDFTj4T5mIQo1UfTMFkFrv1dSv/RWl1g6gJTuNS4o=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pydeps";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thebjorn";
|
||||
repo = "pydeps";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XAUDnhCmO3czZPBpD3AaPxSFBlpqWjQ1xva5mvuF6Lc=";
|
||||
hash = "sha256-0H9DbOwlEUTKy7TvJ21H0GKZ6n2xPu24gYPOBOq2WWQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,19 +8,19 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyfaup-rs";
|
||||
version = "0.4.18";
|
||||
version = "0.4.19";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ail-project";
|
||||
repo = "faup-rs";
|
||||
tag = "pyfaup-rs-v${finalAttrs.version}";
|
||||
hash = "sha256-69StPQKwZ1MnIUiyYssaWPtgElylfgbdvsQ+pe8/Eaw=";
|
||||
hash = "sha256-MatIVV3rhIUb6OypnQjJ61z7u1CmXUtV14R4nfAEme8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-jutE7jkj2Z1w/RAFel/faK5DqReY/ewU62APwn3pTxg=";
|
||||
hash = "sha256-1TnIAzpyGzpOZoHJhfdD0xC0lxKI5kMLXRnjf8piQHY=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "python";
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyprobeplus";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantherale0";
|
||||
repo = "pyprobeplus";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ezBf+ynSz/3r3UXgDOtFwLg6mT8wv+YQ6J55SSVyYUI=";
|
||||
hash = "sha256-GdWeIuXP8AAJAQEnCItUZT+/mEyNPejoj0Y11LPhoAM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pytensor";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -44,7 +44,7 @@ buildPythonPackage (finalAttrs: {
|
||||
postFetch = ''
|
||||
sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' $out/pytensor/_version.py
|
||||
'';
|
||||
hash = "sha256-Kq/kLjdDS/NHveeFmoy0PiHLLXviPpU2zf3lcXhx7Sk=";
|
||||
hash = "sha256-pUI9E76LeCzs1Y51YM0z6awTQIj/WumIqJIgrLYKYEQ=";
|
||||
};
|
||||
|
||||
# DeprecationWarning: scipy.linalg: the `lwork` keyword is deprecated and no longer in use as of
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "stackit-resourcemanager";
|
||||
version = "0.9.1";
|
||||
version = "0.10.0";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: {
|
||||
src = fetchPypi {
|
||||
pname = "stackit_resourcemanager";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-Mx6rmwvKmyJPeUFuO2Z4AR9O/oxTMDs+V4Jw+2AdkHs=";
|
||||
hash = "sha256-6uE/SRpU3eToPJIKgoTN7ksLjo4n0lQ1KrHZKY4M3nQ=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.170";
|
||||
version = "3.1.171";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5frk/TjQdOSi+BMFQpr0XAWTHY8FGUhUMSBHD+QfA4k=";
|
||||
hash = "sha256-PpOtQLw72iLMYarpe9q9aM2RZyA0mmhBv0LiRL3w1UY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "ttconv";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sandflow";
|
||||
repo = "ttconv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2kBEkDX612+H6W0BdtlDScgsgXl/sHRi+jo1vDxTJ7k=";
|
||||
hash = "sha256-UtZeTk305r08LnDet42O4MYBeEhkKSRQjiLk/7Gfx+4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonRelaxDepsHook,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
@@ -11,16 +10,16 @@
|
||||
ufolib2,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "ufomerge";
|
||||
version = "1.9.7";
|
||||
version = "1.9.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "ufomerge";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bA0tXopktnkrLTaRmqppqqQgC0nx8MxncO5oTuZeMQc=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rIIT4FHdKVob+7AWONWcMCrwVZc4bkzni2csJ9L41fE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -38,18 +37,13 @@ buildPythonPackage rec {
|
||||
fontfeatures
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Fails with `KeyError: 'B'`
|
||||
"test_28"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ufomerge" ];
|
||||
|
||||
meta = {
|
||||
description = "Command line utility and Python library that merges two UFO source format fonts into a single file";
|
||||
homepage = "https://github.com/googlefonts/ufomerge";
|
||||
changelog = "https://github.com/googlefonts/ufomerge/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/googlefonts/ufomerge/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ jopejoe1 ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "urllib3-future";
|
||||
version = "2.24.905";
|
||||
version = "2.24.907";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jawah";
|
||||
repo = "urllib3.future";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-sdskb+LdOdLXavDlXJWmIJxLD698jcccGbToah3jLxA=";
|
||||
hash = "sha256-itZQm1QYQ+g1v8EKTSIX45kcyV1B/fXJvPG26SYdKM4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
63
pkgs/development/python-modules/vizaio/default.nix
Normal file
63
pkgs/development/python-modules/vizaio/default.nix
Normal file
@@ -0,0 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
aioresponses,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
platformdirs,
|
||||
pyprojectVersionPatchHook,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
rich,
|
||||
tomlkit,
|
||||
typer,
|
||||
zeroconf,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "vizaio";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raman325";
|
||||
repo = "vizaio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-u0ZHSHzkGna9ajmV7V3n8YKPuI598acnXhIEBXvnU2I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pyprojectVersionPatchHook ];
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
optional-dependencies = {
|
||||
cli = [
|
||||
platformdirs
|
||||
rich
|
||||
tomlkit
|
||||
typer
|
||||
];
|
||||
discovery = [ zeroconf ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
]
|
||||
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
|
||||
|
||||
pythonImportsCheck = [ "vizaio" ];
|
||||
|
||||
meta = {
|
||||
description = "Modern async Python client and CLI for Vizio SmartCast devices";
|
||||
homepage = "https://github.com/raman325/vizaio";
|
||||
changelog = "https://github.com/raman325/vizaio/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
mainProgram = "vizaio";
|
||||
};
|
||||
})
|
||||
@@ -15,14 +15,14 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.18.49";
|
||||
hash = "sha256-4kjRCVsj/nE4gfRg8KgagojPFiAVNa9zmAqls9Le6mI=";
|
||||
version = "6.18.50";
|
||||
hash = "sha256-ZTzKkPGkkzfIgeQc6DOKSW4cCObamH117OjgNVm9cDU=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "7.1.13";
|
||||
hash = "sha256-6ENhT+sf/e0xd2e0r3adcept7fasxz8SCgrpgzEhxU8=";
|
||||
version = "7.2.4";
|
||||
hash = "sha256-Qih/0v0WE5XJueOn93JhG0WhEaI1bfFi0wua4yP9zSo=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -7800,7 +7800,8 @@
|
||||
];
|
||||
"vizio" =
|
||||
ps: with ps; [
|
||||
]; # missing inputs: vizaio
|
||||
vizaio
|
||||
];
|
||||
"vlc_telnet" =
|
||||
ps: with ps; [
|
||||
aiovlc
|
||||
@@ -9429,6 +9430,7 @@
|
||||
"vilfo"
|
||||
"vistapool"
|
||||
"vivotek"
|
||||
"vizio"
|
||||
"vlc_telnet"
|
||||
"vodafone_station"
|
||||
"voicerss"
|
||||
|
||||
@@ -53,6 +53,8 @@ let
|
||||
|
||||
moduleNames = map (mod: mod.pname) modules;
|
||||
|
||||
dynamicModules = lib.filter (mod: mod.dynamic or false) modules;
|
||||
|
||||
mapModules =
|
||||
attrPath:
|
||||
lib.flip lib.concatMap modules (
|
||||
@@ -169,6 +171,7 @@ stdenv.mkDerivation {
|
||||
++ lib.optional (
|
||||
stdenv.buildPlatform != stdenv.hostPlatform
|
||||
) "--crossbuild=${stdenv.hostPlatform.uname.system}::${stdenv.hostPlatform.uname.processor}"
|
||||
++ lib.optional (dynamicModules != [ ]) "--modules-path=${placeholder "out"}/modules"
|
||||
++ configureFlags;
|
||||
|
||||
env = {
|
||||
@@ -212,13 +215,18 @@ stdenv.mkDerivation {
|
||||
''
|
||||
# Make all modules source trees writable
|
||||
+ ''
|
||||
for module in ${toString modules}; do
|
||||
dst="$NIX_BUILD_TOP/$(basename "$module")"
|
||||
cp --recursive "$module" "$dst"
|
||||
addModule() {
|
||||
local dst="$NIX_BUILD_TOP/$(basename "$2")"
|
||||
cp --recursive "$2" "$dst"
|
||||
chmod --recursive +w "$dst"
|
||||
appendToVar configureFlags "--add-module=$dst"
|
||||
done
|
||||
appendToVar configureFlags "$1=$dst"
|
||||
}
|
||||
''
|
||||
+ lib.concatLines (
|
||||
map (
|
||||
mod: "addModule ${if mod.dynamic or false then "--add-dynamic-module" else "--add-module"} ${mod}"
|
||||
) modules
|
||||
)
|
||||
+ preConfigure
|
||||
+ lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
|
||||
|
||||
@@ -275,21 +283,39 @@ stdenv.mkDerivation {
|
||||
|
||||
disallowedReferences = map (m: m.src) modules;
|
||||
|
||||
stripDebugList = [
|
||||
"bin"
|
||||
"sbin"
|
||||
"lib"
|
||||
"modules"
|
||||
];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
noSourceRefs = lib.concatMapStrings (
|
||||
m: "remove-references-to -t ${m.src} $(readlink -fn $out/bin/nginx)\n"
|
||||
) modules;
|
||||
dynamicPost = lib.optionalString (dynamicModules != [ ]) ''
|
||||
shopt -s nullglob
|
||||
sofiles=("$out"/modules/*.so)
|
||||
if (( ''${#sofiles[@]} == 0 )); then
|
||||
echo "nginx: dynamic modules were requested but no .so was produced in $out/modules" >&2
|
||||
exit 1
|
||||
fi
|
||||
mkdir -p "$out/etc/nginx"
|
||||
printf 'load_module %s;\n' "''${sofiles[@]}" > "$out/etc/nginx/dynamic-modules.conf"
|
||||
'';
|
||||
in
|
||||
postInstall + noSourceRefs;
|
||||
postInstall + noSourceRefs + dynamicPost;
|
||||
|
||||
passthru = {
|
||||
inherit modules;
|
||||
inherit modules dynamicModules;
|
||||
tests =
|
||||
passthru.tests or {
|
||||
inherit (nixosTests)
|
||||
nginx
|
||||
nginx-auth
|
||||
nginx-dynamic-modules
|
||||
nginx-etag
|
||||
nginx-etag-compression
|
||||
nginx-globalredirect
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.31.4";
|
||||
hash = "sha256-5vILZEoXpkPwWa5kZ6GXH+KBFYfQJeBxBodTofHjs8M=";
|
||||
version = "1.31.5";
|
||||
hash = "sha256-6VFgfVNINmJL02trRacdv7BVI33q43ONprvzJw2tonk=";
|
||||
}
|
||||
|
||||
@@ -22236,6 +22236,8 @@ self: super: with self; {
|
||||
inherit (pkgs.libsForQt5) wrapQtAppsHook;
|
||||
};
|
||||
|
||||
vizaio = callPackage ../development/python-modules/vizaio { };
|
||||
|
||||
vl-convert-python = callPackage ../development/python-modules/vl-convert-python {
|
||||
inherit (pkgs) protobuf;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user