Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2024-12-05 06:05:31 +00:00
committed by GitHub
65 changed files with 860 additions and 591 deletions
+6
View File
@@ -21857,6 +21857,12 @@
githubId = 2084639;
name = "Manu";
};
tensor5 = {
github = "tensor5";
githubId = 1545895;
matrix = "@tensor5:matrix.org";
name = "Nicola Squartini";
};
teozkr = {
email = "teo@nullable.se";
github = "nightkr";
@@ -71,6 +71,8 @@
- `gkraken` software and `hardware.gkraken.enable` option have been removed, use `coolercontrol` via `programs.coolercontrol.enable` option instead.
- `nodePackages.ganache` has been removed, as the package has been deprecated by upstream.
- `containerd` has been updated to v2, which contains breaking changes. See the [containerd
2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
details.
@@ -52,6 +52,7 @@ let
"keylight"
"klipper"
"knot"
"libvirt"
"lnd"
"mail"
"mikrotik"
@@ -0,0 +1,29 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.prometheus.exporters.libvirt;
in
{
port = 9177;
extraOpts = {
libvirtUri = lib.mkOption {
type = lib.types.str;
default = "qemu:///system";
description = "Libvirt URI from which to extract metrics";
};
};
serviceOpts = {
serviceConfig = {
ExecStart = ''
${lib.getExe pkgs.prometheus-libvirt-exporter} \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
--libvirt.uri ${cfg.libvirtUri} ${lib.concatStringsSep " " cfg.extraFlags}
'';
};
};
}
@@ -5,7 +5,6 @@
, lib
, lighthouse
, nix-update-script
, nodePackages
, openssl
, pkg-config
, postgresql
@@ -131,7 +130,6 @@ rustPlatform.buildRustPackage rec {
];
nativeCheckInputs = [
nodePackages.ganache
postgresql
];
@@ -72,14 +72,8 @@ let
"-f" "{connection_file}"
];
language = "cpp";
logo32 = fetchurl {
url = "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/ISO_C%2B%2B_Logo.svg/32px-ISO_C%2B%2B_Logo.svg.png";
hash = "sha256-+TKtwXybKw4oAHfgOsDxvL4ucItPguF76HJHdFTd3s0=";
};
logo64 = fetchurl {
url = "https://upload.wikimedia.org/wikipedia/commons/thumb/1/18/ISO_C%2B%2B_Logo.svg/64px-ISO_C%2B%2B_Logo.svg.png";
hash = "sha256-7SjOcSaSPUHIKnjBxMdn+KSjviL69IXhX7eJsacYeGE=";
};
logo32 = "${xeus-cling-unwrapped}/share/jupyter/kernels/xcpp17/logo-32x32.png";
logo64 = "${xeus-cling-unwrapped}/share/jupyter/kernels/xcpp17/logo-64x64.png";
};
in
@@ -165,9 +165,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
version = "1.10.0";
hash = "sha256-GvFBefp1RWqgB79Sv+2vYZyTjeLEYNsXFJrJxEUJAlY=";
vendorHash = "sha256-UmPnOfjR6kYI0TMH2J54LzDeDGJKMkAC0xZk6xstIuk=";
version = "1.10.1";
hash = "sha256-fOilZJbkPkGNcnKYBZtH81YE+XHsXsvxFAMt6YRcJCo=";
vendorHash = "sha256-AajBuUwOhK0OniRRfCqR89+mA9LnQBkbG3Xge9c0qSQ=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;
@@ -1,53 +1,79 @@
{ buildDotnetModule, emptyDirectory, fetchNupkg, dotnet-sdk }:
{
buildDotnetModule,
emptyDirectory,
fetchNupkg,
dotnet-sdk,
lib,
}:
{ pname
, version
# Name of the nuget package to install, if different from pname
, nugetName ? pname
# Hash of the nuget package to install, will be given on first build
# nugetHash uses SRI hash and should be preferred
, nugetHash ? ""
, nugetSha256 ? ""
# Additional nuget deps needed by the tool package
, nugetDeps ? (_: [])
# Executables to wrap into `$out/bin`, same as in `buildDotnetModule`, but with
# a default of `pname` instead of null, to avoid auto-wrapping everything
, executables ? pname
# The dotnet runtime to use, dotnet tools need a full SDK to function
, dotnet-runtime ? dotnet-sdk
, ...
} @ args:
fnOrAttrs:
buildDotnetModule (args // {
inherit pname version dotnet-runtime executables;
buildDotnetModule (
finalAttrs:
(
{
pname,
version,
# Name of the nuget package to install, if different from pname
nugetName ? pname,
# Hash of the nuget package to install, will be given on first build
# nugetHash uses SRI hash and should be preferred
nugetHash ? "",
nugetSha256 ? "",
# Additional nuget deps needed by the tool package
nugetDeps ? (_: [ ]),
# Executables to wrap into `$out/bin`, same as in `buildDotnetModule`, but with
# a default of `pname` instead of null, to avoid auto-wrapping everything
executables ? pname,
# The dotnet runtime to use, dotnet tools need a full SDK to function
dotnet-runtime ? dotnet-sdk,
...
}@args:
let
nupkg = fetchNupkg {
pname = nugetName;
inherit version;
sha256 = nugetSha256;
hash = nugetHash;
installable = true;
};
in
args
// {
inherit
pname
version
dotnet-runtime
executables
;
src = emptyDirectory;
src = emptyDirectory;
buildInputs = [
(fetchNupkg {
pname = nugetName;
inherit version;
sha256 = nugetSha256;
hash = nugetHash;
installable = true;
})
];
buildInputs = [ nupkg ];
dotnetGlobalTool = true;
dotnetGlobalTool = true;
useDotnetFromEnv = true;
useDotnetFromEnv = true;
dontBuild = true;
dontBuild = true;
installPhase = ''
runHook preInstall
installPhase = ''
runHook preInstall
dotnet tool install --tool-path $out/lib/${pname} ${nugetName}
dotnet tool install --tool-path $out/lib/${pname} ${nugetName}
# remove files that contain nix store paths to temp nuget sources we made
find $out -name 'project.assets.json' -delete
find $out -name '.nupkg.metadata' -delete
# remove files that contain nix store paths to temp nuget sources we made
find $out -name 'project.assets.json' -delete
find $out -name '.nupkg.metadata' -delete
runHook postInstall
'';
})
runHook postInstall
'';
passthru = {
updateScript = ./update.sh;
nupkg = nupkg;
} // args.passthru or {};
}
)
(if lib.isFunction fnOrAttrs then fnOrAttrs finalAttrs else fnOrAttrs)
)
@@ -0,0 +1,24 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq nix common-updater-scripts
# shellcheck shell=bash
set -euo pipefail
attr=$UPDATE_NIX_ATTR_PATH
nixeval() {
nix --extra-experimental-features nix-command eval --json --impure -f . "$1" | jq -r .
}
nugetName=$(nixeval "$attr.nupkg.pname")
# always skip prerelease versions for now
version=$(curl -fsSL "https://api.nuget.org/v3-flatcontainer/$nugetName/index.json" |
jq -er '.versions | last(.[] | select(match("^[0-9]+\\.[0-9]+\\.[0-9]+$")))')
if [[ $version == $(nixeval "$attr.version") ]]; then
echo "$attr" is already version "$version"
exit 0
fi
update-source-version "$attr" "$version" --source-key=nupkg.src
+13
View File
@@ -0,0 +1,13 @@
diff --git a/frontends/qt/genassets.sh b/frontends/qt/genassets.sh
index 4b1ba87be..b5a9ad279 100755
--- a/frontends/qt/genassets.sh
+++ b/frontends/qt/genassets.sh
@@ -20,7 +20,7 @@ if [ ! -d ../web/build ]; then
fi
echo '<!DOCTYPE RCC><RCC version="1.0"><qresource>' > assets.qrc
-/usr/bin/find ../web/build/ -maxdepth 3 -type f | sed -e "s|../web/build/||" | awk '{ print "<file alias=\"" $1 "\">../web/build/" $1 "</file>" '} >> assets.qrc
+find ../web/build/ -maxdepth 3 -type f | sort | sed -e "s|../web/build/||" | awk '{ print "<file alias=\"" $1 "\">../web/build/" $1 "</file>" '} >> assets.qrc
echo '<file alias="trayicon.png">resources/trayicon.png</file>' >> assets.qrc
echo '</qresource></RCC>' >> assets.qrc
+89
View File
@@ -0,0 +1,89 @@
{
lib,
stdenv,
fetchFromGitHub,
buildNpmPackage,
clang,
go,
libsForQt5,
}:
stdenv.mkDerivation rec {
pname = "bitbox";
version = "4.46.3";
src = fetchFromGitHub {
owner = "BitBoxSwiss";
repo = "bitbox-wallet-app";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-2oGVQ022NGOHLo7TBdeXG3ng1nYW8fyLwSV0hJdAl9I=";
};
patches = [
./genassets.patch
];
postPatch = ''
substituteInPlace frontends/qt/resources/linux/usr/share/applications/bitbox.desktop \
--replace-fail 'Exec=BitBox %u' 'Exec=bitbox %u'
'';
dontConfigure = true;
passthru.web = buildNpmPackage {
pname = "bitbox-web";
inherit version;
inherit src;
sourceRoot = "source/frontends/web";
npmDepsHash = "sha256-w98wwKHiZtor5ivKd+sh5K8HnAepu6cw9RyVJ+eTq3k=";
installPhase = "cp -r build $out";
};
buildPhase = ''
runHook preBuild
ln -s ${passthru.web} frontends/web/build
export GOCACHE=$TMPDIR/go-cache
cd frontends/qt
make -C server linux
./genassets.sh
qmake -o build/Makefile
cd build
make
cd ../../..
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir $out
cp -r frontends/qt/resources/linux/usr/share $out
mkdir $out/{bin,lib}
cp frontends/qt/build/BitBox $out/bin/bitbox
cp frontends/qt/build/assets.rcc $out/bin
cp frontends/qt/server/libserver.so $out/lib
install -Dt $out/lib/udev/rules.d ${./rules.d}/*
runHook postInstall
'';
buildInputs = [ libsForQt5.qtwebengine ];
nativeBuildInputs = [
clang
go
libsForQt5.wrapQtAppsHook
];
meta = {
description = "Companion app for the BitBox02 hardware wallet";
homepage = "https://bitbox.swiss/app/";
license = lib.licenses.asl20;
mainProgram = "bitbox";
maintainers = [ lib.maintainers.tensor5 ];
platforms = [ "x86_64-linux" ];
};
}
@@ -0,0 +1 @@
SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402"
@@ -0,0 +1 @@
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbbf%n"
@@ -0,0 +1 @@
SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="bitbox02_%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403"
@@ -0,0 +1 @@
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="bitbox02-%n"
+3 -3
View File
@@ -12,13 +12,13 @@
buildNpmPackage rec {
pname = "bitwarden-cli";
version = "2024.11.0";
version = "2024.11.1";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "cli-v${version}";
hash = "sha256-4QTQgW8k3EMf07Xqs2B+VXQOUPzoOgaNvoC02x4zvu8=";
hash = "sha256-J7gmrSAiu59LLP9pKfbv9+H00vXGQCrjkd4GBhkcyTY=";
};
postPatch = ''
@@ -28,7 +28,7 @@ buildNpmPackage rec {
nodejs = nodejs_20;
npmDepsHash = "sha256-YzhCyNMvfXGmgOpl3qWj1Pqd1hY8CJ9QLwQds5ZMnqg=";
npmDepsHash = "sha256-MZoreHKmiUUxhq3tmL4lPp6vPmoQIqG3IPpZE56Z1Kc=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
cctools
+5 -128
View File
@@ -1,3 +1,6 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Avalonia"; version = "0.10.15"; hash = "sha256-YZCHjRkQ3b4sFQz/WcS68yWtHHDdjkcjmMup259JLgs="; })
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; hash = "sha256-ahDcJNCqlNniItcat7owREQ0hfIwMWFNhnDu89lAVRI="; })
@@ -8,63 +11,23 @@
(fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.15"; hash = "sha256-EDz78nCxmdPyGRHMtGT7q37K6Gigh7+8ZZmIr7VVlnY="; })
(fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.15"; hash = "sha256-nPv8iPGBCOVBMKjeTw8xjHk6ZcGDsdGIPIwvpCiSqtM="; })
(fetchNuGet { pname = "Avalonia.X11"; version = "0.10.15"; hash = "sha256-ahqoRw/htLvmyl+bpmpr7kAiV8hlm1BCFWs0hWIKDYg="; })
(fetchNuGet { pname = "coverlet.collector"; version = "1.2.0"; hash = "sha256-ai492Ynh/rPj/i4nVEsvXMx3W68guiWJVxD3EdNscD0="; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; hash = "sha256-dtvXNjVSU1WZ4kFsT6VV56R8iGMPHtdM09dfeejnttw="; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; hash = "sha256-Vyy8zgtqw1uLJTbWNTS+wt/7yNuO4qzYU5a91Sf1ApA="; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; hash = "sha256-YqGYQttBmNRCmkSS+JRfqTsPnuMdKxkYU9ctS5mKFV0="; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; hash = "sha256-QAwWpNc03Vh2RSqIW0xE/rmQCvl/IWs87QREqZNXMtk="; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; hash = "sha256-J9exQ3FxRHMF8tHTc4zhjYGQ6eBYb4ZKwWhzk2L0uuQ="; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; hash = "sha256-6I/8HtwvEK0JLgRcSrCzCtUfMylj88s5JNcl9ZDoLb8="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.29"; hash = "sha256-Mo/zwurMwqJSeWZAzpfmLFeTMTCZNXY+zySA8RdPZXw="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.29"; hash = "sha256-MDba6TI+nnDG1Nzb4219DEXOlxxh2c1zGRzdehhVMww="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.29"; hash = "sha256-JASXP49jpQQd4GDL7C7JS4zgRjbsvE2B+T0eyTPr0S8="; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; hash = "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI="; })
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.5.0"; hash = "sha256-rpZmS5Yn9f2lrUu+88AjrOcLMd9oFLJoctx7TOznIBg="; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.5.0"; hash = "sha256-2C0hHFcV2TrQGEbYYybhxzVMumqEcRnQd7WWyP5exaU="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.29"; hash = "sha256-lLZZKK4j/5tMg97mF0NaYtBvpIW4AzgVP+wJuidlPw8="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.29"; hash = "sha256-m9JOmgZ9/XrMeZRQ1IUnbofyKuGwbaJwFMSff3+mA04="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.29"; hash = "sha256-jiWkCOXH8Te9m5SecvCCMwVVdAALnPZb9EF2QpptZT8="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.29"; hash = "sha256-txfm2BBeE30sLJXcF4Ik8JLXzwCglO2Lqnjbp9mxYq4="; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.29"; hash = "sha256-wdgAt0uE13QYyWTITtrJ0mdEcGAKhH+3RVYAQTK/HkI="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.1"; hash = "sha256-ByV7aEFjGR4L4Tudg4KaJ96lnzr7RhOxzWGE0p5XFRY="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.5.0"; hash = "sha256-3Fq3c9Fz48815JNZPTytXCw0U4GtPQ7se4w7kF2QBwo="; })
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.5.0"; hash = "sha256-u+wgYjfZ49GF+H8U6SmcTJp07M9r9lYKFElhaozWmyE="; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; hash = "sha256-WFqy842DMQG4W1H2ewXWflfBJ+lQf/LwP0KI4OfY0zo="; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; hash = "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo="; })
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.1.0"; hash = "sha256-nx2sj648hXUtrlOGGHi8diWETAifjWkGC9mSaaVHO7w="; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "2.1.0"; hash = "sha256-F7T4EhgnYnld6sm2tNQaevoUbKbgQ8ogGyVx6g8kTFU="; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; hash = "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="; })
(fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; hash = "sha256-FZC+BNSzSkN3rObLJJAqwW/vNnJ+PiwdvNNufuISWVY="; })
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; })
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; })
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; })
(fetchNuGet { pname = "runtime.linux-x64.CoreCompat.System.Drawing"; version = "1.0.0-beta009"; hash = "sha256-x0YbFnqFOll95baAWuVhEx8egxDN4poucOQh1bt0YLk="; })
(fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; })
(fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; })
(fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; })
(fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; })
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; })
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; })
(fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; })
(fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; })
(fetchNuGet { pname = "runtime.osx.10.10-x64.CoreCompat.System.Drawing"; version = "5.8.64"; hash = "sha256-F7qsAOHGlOdt7K3pGJyz+bsQmehOwoBEiaxN7CIqq9Q="; })
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; })
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; })
(fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; })
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; })
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; })
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; hash = "sha256-1Q50COfWkU4/y9eBWj0jPDp3qvy19vRCZnDKQthrhUU="; })
(fetchNuGet { pname = "SharpCompress"; version = "0.26.0"; hash = "sha256-BcdSBd4Hv1zg1YGpfgKGG37DcxeWpW+sW0EScpF7ng0="; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.0"; hash = "sha256-0YpAxE+MyEydxBSmI9zqqqSII2Qvp2gz9pVUcf1/DnM="; })
@@ -76,110 +39,24 @@
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; hash = "sha256-OH8aBCNQPR0QQWg3cUytuYW49JET+wF8poDYR6gXklc="; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; hash = "sha256-dxdvAJOIw55u0Dd9NOyNYfE2XAg3Jv89J54TtTKJtow="; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; hash = "sha256-m24HrDOUXn6s+HJqMs3eQb2Q5lqTTZp+cvEeEtpSoMw="; })
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; })
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; })
(fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; })
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; })
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; })
(fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; })
(fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; })
(fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; hash = "sha256-gx3IHPvPNRmwpLwtswu12U/ow4f/7OPAeHxyMxw5qyU="; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; })
(fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; hash = "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="; })
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; })
(fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; hash = "sha256-DLYGJraIfSj0Zmpi2H5Am2AsZ+kP5UVGdjakqj9Q2E4="; })
(fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; hash = "sha256-8PgFBZ3Agd+UI9IMxr4fRIW8IA1hqCl15nqlLTJETzk="; })
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; })
(fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; })
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; })
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; })
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; })
(fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; })
(fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; })
(fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; })
(fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; })
(fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; })
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; })
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; })
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; })
(fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; hash = "sha256-MjVaZHx8DUFnVUxOEEaU9GxF6EyEXbcuI1V7yRXEp0w="; })
(fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; })
(fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; })
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; })
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; })
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; })
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; })
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; hash = "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y="; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; })
(fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; })
(fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; })
(fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; })
(fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; })
(fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; })
(fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; })
(fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; })
(fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; })
(fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; })
(fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.1"; hash = "sha256-OUA8ttAKGgqD5KUwtnO2OewBF/tJI0nO3YcunK5qMPg="; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.0"; hash = "sha256-IYctBEelnDQbDTPJh0yfFRucAQvPkXaymmswWYx/l5A="; })
(fetchNuGet { pname = "System.Text.Json"; version = "5.0.0"; hash = "sha256-epL8glCZZnsgW+dcmVtsYX0uZ08Jvhkzri9j81Gg774="; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; })
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; })
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; })
(fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; })
(fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; hash = "sha256-w332WVsJrdAOnlSUtgvatSTtnoC81C3LG6J2ip42fW8="; })
]
@@ -0,0 +1,143 @@
From aecfb0a69f9e418158d4a09ec955e0c3f4d8f062 Mon Sep 17 00:00:00 2001
From: Lyze <11274700+lyze237@users.noreply.github.com>
Date: Fri, 20 Sep 2024 19:48:58 +0200
Subject: [PATCH] Fix nixos crashing
---
.../LogicReinc.BlendFarm.Client.csproj | 2 +-
LogicReinc.BlendFarm.Client/RenderTask.cs | 1 +
LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs | 1 +
LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs | 1 +
LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs | 1 +
.../runtimeconfig.template.json | 10 ++++++++++
LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj | 2 --
LogicReinc.BlendFarm/nuget.config | 11 -----------
LogicReinc.BlendFarm/runtimeconfig.template.json | 10 ++++++++++
9 files changed, 25 insertions(+), 14 deletions(-)
create mode 100644 LogicReinc.BlendFarm.Client/runtimeconfig.template.json
delete mode 100644 LogicReinc.BlendFarm/nuget.config
create mode 100644 LogicReinc.BlendFarm/runtimeconfig.template.json
diff --git a/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj b/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj
index d534ea7..698e8d6 100644
--- a/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj
+++ b/LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj
@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+ <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="5.0.0" />
</ItemGroup>
diff --git a/LogicReinc.BlendFarm.Client/RenderTask.cs b/LogicReinc.BlendFarm.Client/RenderTask.cs
index 9cc67dd..5ba3086 100644
--- a/LogicReinc.BlendFarm.Client/RenderTask.cs
+++ b/LogicReinc.BlendFarm.Client/RenderTask.cs
@@ -13,6 +13,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter;
namespace LogicReinc.BlendFarm.Shared
{
diff --git a/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs b/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs
index 310fa20..d84dbea 100644
--- a/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs
+++ b/LogicReinc.BlendFarm.Client/Tasks/ChunkedTask.cs
@@ -5,6 +5,7 @@
using System.Drawing;
using System.Linq;
using System.Text;
+using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter;
namespace LogicReinc.BlendFarm.Client.Tasks
{
diff --git a/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs b/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs
index 6ed55dd..bf1eb14 100644
--- a/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs
+++ b/LogicReinc.BlendFarm.Client/Tasks/SplitChunkedTask.cs
@@ -8,6 +8,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter;
namespace LogicReinc.BlendFarm.Client.Tasks
{
diff --git a/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs b/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs
index 7edcb92..5483d8f 100644
--- a/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs
+++ b/LogicReinc.BlendFarm.Client/Tasks/SplittedTask.cs
@@ -9,6 +9,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+using ImageConverter = LogicReinc.BlendFarm.Client.ImageTypes.ImageConverter;
namespace LogicReinc.BlendFarm.Client.Tasks
{
diff --git a/LogicReinc.BlendFarm.Client/runtimeconfig.template.json b/LogicReinc.BlendFarm.Client/runtimeconfig.template.json
new file mode 100644
index 0000000..738771b
--- /dev/null
+++ b/LogicReinc.BlendFarm.Client/runtimeconfig.template.json
@@ -0,0 +1,10 @@
+{
+ "properties": {
+ "runtimeOptions": {
+ "System.Drawing.EnableUnixSupport": true
+ }
+ },
+ "configProperties": {
+ "System.Drawing.EnableUnixSupport": true
+ }
+}
diff --git a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
index 97aa471..7e7096c 100644
--- a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
+++ b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
@@ -60,8 +60,6 @@
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.15" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
- <PackageReference Include="runtime.linux-x64.CoreCompat.System.Drawing" Version="1.0.0-beta009" />
- <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.0" />
</ItemGroup>
<ItemGroup>
diff --git a/LogicReinc.BlendFarm/nuget.config b/LogicReinc.BlendFarm/nuget.config
deleted file mode 100644
index 6c273ab..0000000
--- a/LogicReinc.BlendFarm/nuget.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- To use the Avalonia CI feed to get unstable packages, move this file to the root of your solution.
--->
-
-<configuration>
- <packageSources>
- <add key="AvaloniaCI" value="https://www.myget.org/F/avalonia-ci/api/v2" />
- </packageSources>
-</configuration>
diff --git a/LogicReinc.BlendFarm/runtimeconfig.template.json b/LogicReinc.BlendFarm/runtimeconfig.template.json
new file mode 100644
index 0000000..738771b
--- /dev/null
+++ b/LogicReinc.BlendFarm/runtimeconfig.template.json
@@ -0,0 +1,10 @@
+{
+ "properties": {
+ "runtimeOptions": {
+ "System.Drawing.EnableUnixSupport": true
+ }
+ },
+ "configProperties": {
+ "System.Drawing.EnableUnixSupport": true
+ }
+}
@@ -0,0 +1,14 @@
diff --git a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
index 97aa471..3eaa259 100644
--- a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
+++ b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
@@ -9,6 +9,9 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PackageIcon>icon.png</PackageIcon>
</PropertyGroup>
+ <PropertyGroup>
+ <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
+</PropertyGroup>
<ItemGroup>
<AvaloniaXaml Remove="Content\**" />
<Compile Remove="Content\**" />
+39
View File
@@ -0,0 +1,39 @@
diff --git a/LogicReinc.BlendFarm.Server/LogicReinc.BlendFarm.Server.csproj b/LogicReinc.BlendFarm.Server/LogicReinc.BlendFarm.Server.csproj
index 9bd2039..720bcb0 100644
--- a/LogicReinc.BlendFarm.Server/LogicReinc.BlendFarm.Server.csproj
+++ b/LogicReinc.BlendFarm.Server/LogicReinc.BlendFarm.Server.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup>
diff --git a/LogicReinc.BlendFarm.Tests/LogicReinc.BlendFarm.Tests.csproj b/LogicReinc.BlendFarm.Tests/LogicReinc.BlendFarm.Tests.csproj
index 5a00198..839f2d7 100644
--- a/LogicReinc.BlendFarm.Tests/LogicReinc.BlendFarm.Tests.csproj
+++ b/LogicReinc.BlendFarm.Tests/LogicReinc.BlendFarm.Tests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
diff --git a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
index 97aa471..5a01eb8 100644
--- a/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
+++ b/LogicReinc.BlendFarm/LogicReinc.BlendFarm.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ApplicationIcon>render.ico</ApplicationIcon>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
</PropertyGroup>
+16 -2
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
buildDotnetModule,
dotnetCorePackages,
xz,
@@ -54,6 +55,19 @@ buildDotnetModule rec {
hash = "sha256-2w2tdl5n0IFTuthY97NYMeyRe2r72jaKFfoNSjWQMM4=";
};
patches = [
# https://github.com/LogicReinc/LogicReinc.BlendFarm/pull/121
./fix-nixos-crashing-on-runtime.patch
# https://github.com/LogicReinc/LogicReinc.BlendFarm/pull/122
./rename-evee-to-eevee_next.patch
# Fixes the error with net8 update:
# "The referenced project is a non self-contained executable.
# A non self-contained executable cannot be referenced by a self-contained executable"
./fix-references.patch
# Update project files to net8
./net8.patch
];
nativeBuildInputs =
[ ]
++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
@@ -86,8 +100,8 @@ buildDotnetModule rec {
"liblzma.so.5"
];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
projectFile = [
"LogicReinc.BlendFarm.Client/LogicReinc.BlendFarm.Client.csproj"
@@ -0,0 +1,36 @@
From 6276136de0fc567d3a2cc2ecff6effc27688d1a4 Mon Sep 17 00:00:00 2001
From: Lyze <11274700+lyze237@users.noreply.github.com>
Date: Fri, 20 Sep 2024 20:04:13 +0200
Subject: [PATCH] Fix eevee getting renamed to eevee_next
---
LogicReinc.BlendFarm.Server/render.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/LogicReinc.BlendFarm.Server/render.py b/LogicReinc.BlendFarm.Server/render.py
index dcff178..f0cf304 100644
--- a/LogicReinc.BlendFarm.Server/render.py
+++ b/LogicReinc.BlendFarm.Server/render.py
@@ -19,6 +19,7 @@
from multiprocessing import cpu_count
isPre3 = bpy.app.version < (3,0,0);
+isPreEeveeRename = bpy.app.version < (4, 2, 0);
if(isPre3):
print('Detected Blender >= 3.0.0\n');
@@ -218,8 +219,12 @@ def renderWithSettings(renderSettings, id, path):
scn.render.fps = fps;
if(engine == 1): #Eevee
- print("Using EEVEE");
- scn.render.engine = "BLENDER_EEVEE";
+ if(isPreEeveeRename):
+ print("Using EEVEE");
+ scn.render.engine = "BLENDER_EEVEE";
+ else:
+ print("Using EEVEE_NEXT");
+ scn.render.engine = "BLENDER_EEVEE_NEXT";
else:
scn.render.engine = "CYCLES";
-5
View File
@@ -2,7 +2,6 @@
lib,
buildDotnetGlobalTool,
dotnetCorePackages,
nix-update-script,
}:
let
inherit (dotnetCorePackages) sdk_8_0;
@@ -17,10 +16,6 @@ buildDotnetGlobalTool rec {
dotnet-sdk = sdk_8_0;
dotnet-runtime = sdk_8_0;
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Roslyn-based LSP language server for C#";
mainProgram = "csharp-ls";
+2 -2
View File
@@ -2,10 +2,10 @@
buildDotnetGlobalTool {
pname = "csharpier";
version = "0.29.1";
version = "0.30.2";
executables = "dotnet-csharpier";
nugetHash = "sha256-VW9QzbQfbY3Tz+Gz3hQ7VC4wOtwfIYV1Yq2WJz6bL04=";
nugetHash = "sha256-MrpsVlIYyrlu3VvEPcLQRgD2lhfu8ZTN3pUZrZ9nQcA=";
meta = with lib; {
description = "Opinionated code formatter for C#";
+3
View File
@@ -37,6 +37,8 @@
x265,
libGLX,
libGLU,
cudaPackages,
enableCuda ? config.cudaSupport,
kdePackages,
@@ -171,6 +173,7 @@ stdenv.mkDerivation (finalAttrs: {
#(lib.cmakeBool "ENABLE_AKONADICONTACTSUPPORT" true)
(lib.cmakeBool "ENABLE_MEDIAPLAYER" true)
(lib.cmakeBool "ENABLE_APPSTYLES" true)
(lib.optionals enableCuda "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}")
];
# Tests segfault for some reason…
+49
View File
@@ -0,0 +1,49 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
glib,
cairo,
wayland,
libGL,
}:
rustPlatform.buildRustPackage rec {
pname = "enkei";
version = "0.9.3";
src = fetchFromGitHub {
owner = "fia0";
repo = "enkei";
rev = "v${version}";
sha256 = "sha256-COU2JtiJcPRA3Jno0qLEIVgimYBWfn5Pgc1OMImsJtI=";
};
cargoHash = "sha256-nf9JM5FfXBNEKzZrfu3jphupL9PdoQLVpqGoZ/X9p5E=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
wayland
libGL
glib
cairo
];
doCheck = false; # no tests
meta = with lib; {
description = "Wallpaper daemon and control tool for Wayland";
longDescription = ''
Created to allow displaying dynamic wallpapers based on the specification format used for example in the `Gnome` desktop environment.
It is designed to offer a _smooth_ transition between wallpapers and gradual change over long and short periods of time.
For a fast handling `enkei` uses `OpenGL` to render images and blending them for transitions.
'';
homepage = "https://github.com/jwuensche/enkei";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ppenguin ];
};
}
+3 -3
View File
@@ -8,7 +8,7 @@ buildGoModule rec {
version = "1.16.9";
src = fetchFromGitHub {
owner = "antonmedv";
owner = "expr-lang";
repo = "expr";
rev = "v${version}";
hash = "sha256-AyFL+XHxitueAadx1M/xWqeittDCQ/hzsE/fUzt75yI=";
@@ -26,8 +26,8 @@ buildGoModule rec {
meta = with lib; {
description = "Expression language and expression evaluation for Go";
homepage = "https://github.com/antonmedv/expr";
changelog = "https://github.com/antonmedv/expr/releases/tag/${src.rev}";
homepage = "https://github.com/expr-lang/expr";
changelog = "https://github.com/expr-lang/expr/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "expr";
+1 -1
View File
@@ -153,7 +153,7 @@ buildGoModule rec {
updateScript = nix-update-script {
extraArgs = nixUpdateExtraArgs ++ [
"--version-regex"
"v(${lib.versions.major version}\.[0-9.]+)"
"v(${lib.versions.major version}\\.[0-9.]+)"
];
};
};
@@ -5,11 +5,11 @@
}:
let
pname = "handheld-daemon-ui";
version = "3.2.3";
version = "3.3.0";
src = fetchurl {
url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage";
hash = "sha256-VhJrOvE+BebJIAeQlwOOsPfqSrvBnJQavGT7glTrG2o=";
hash = "sha256-Fc2MwZoy1CKiWvh/Z1P0OnfkyWy4aT6I1aIY8gEf69U=";
};
extractedFiles = appimageTools.extractType2 { inherit pname version src; };
in
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "hck";
version = "0.10.1";
version = "0.11.0";
src = fetchFromGitHub {
owner = "sstadick";
repo = pname;
rev = "v${version}";
hash = "sha256-7a+gNnxr/OiM5MynOxOQ3hAprog7eAAZnMvi+5/gMzg=";
hash = "sha256-ZzmInCx75IjNQBQmattc7JZwtD6zGYCQ4eTgDFz2L00=";
};
cargoHash = "sha256-rGKD09YV+QqzZ1n6gYerjbpTr+4KJ5UzynDDRw5rnP0=";
cargoHash = "sha256-BPLhdbC5XFsRfvObaEa4nmYWCN1FxbJzmgZK1JpBcLQ=";
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null;
stdenv.mkDerivation rec {
pname = "highfive${lib.optionalString mpiSupport "-mpi"}";
version = "2.10.0";
version = "2.10.1";
src = fetchFromGitHub {
owner = "BlueBrain";
repo = "HighFive";
rev = "v${version}";
sha256 = "sha256-0ACT899G+CCc08UFsSC8SnUEZR2mrpQbqXW9FklRAjU=";
sha256 = "sha256-Nv+nbel/xGlGTB8sKF0EM1xwz/ZEri5uGB7ma6Ba6fo=";
};
nativeBuildInputs = [ cmake ];
+6 -4
View File
@@ -12,6 +12,7 @@
gtk-layer-shell,
adwaita-icon-theme,
libxkbcommon,
libdbusmenu-gtk3,
openssl,
pkg-config,
hicolor-icon-theme,
@@ -29,16 +30,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ironbar";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "JakeStanger";
repo = "ironbar";
rev = "v${version}";
hash = "sha256-bvg7U7asuTONZgINQO8wSM2QjXAybvV7j5Ex/g6IDok=";
hash = "sha256-UtBO1XaghmzKv9qfhfoLi4ke+mf+Mtgh4f4UpCeEVDg=";
};
cargoHash = "sha256-Hlucn83Uf1XydRY4SYso+fJ5EvH2hOGmCFYuKgCeSuE=";
cargoHash = "sha256-PIesf/wqz8jrc7WbPBvku4MOTAbNq6m4VhYSKoStvY8=";
buildInputs =
[
@@ -55,7 +56,8 @@ rustPlatform.buildRustPackage rec {
]
++ lib.optionals (hasFeature "http") [ openssl ]
++ lib.optionals (hasFeature "volume") [ libpulseaudio ]
++ lib.optionals (hasFeature "cairo") [ luajit ];
++ lib.optionals (hasFeature "cairo") [ luajit ]
++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ];
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -44,13 +44,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "koboldcpp";
version = "1.78";
version = "1.79.1";
src = fetchFromGitHub {
owner = "LostRuins";
repo = "koboldcpp";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-6RvodNWO/IVGlKxC/zt0itYDzymhk+hEBpbmQ1jHigU=";
hash = "sha256-RHeEI6mJklGF7BQXxLwxSr1xD6GsI9+fio888UxKru0=";
};
enableParallelBuilding = true;
+3 -3
View File
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "kuttl";
version = "0.19.0";
version = "0.20.0";
cli = "kubectl-kuttl";
src = fetchFromGitHub {
owner = "kudobuilder";
repo = "kuttl";
rev = "v${version}";
sha256 = "sha256-7fcVmLvRbKYuWuqwqZWlQf08YEyowcTxrp5RteV8qyU=";
sha256 = "sha256-RZmylvf4q1JD8EAnxiFVfu9Q/ya1TXnbZhn4RguehII=";
};
vendorHash = "sha256-E6gzr9gCLbRaoJU/pYA2cAy0rv5SUVmwf0m34lchF+M=";
vendorHash = "sha256-XdHgPN0gE1ie4kxqmZQgxlV+RUddu6OPbqWwIHAw6Hc=";
subPackages = [ "cmd/kubectl-kuttl" ];
+3 -3
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.151.2";
version = "1.151.4";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-PSVRLJAnogWu9XUoVv/PBXkXxC4xS3FS7UE3fQ/jnKY=";
hash = "sha256-GySzclwnplL6GwK01Msn4REzW2eiynLKtEjonvUzMto=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "deltachat-core-rust";
inherit version src;
hash = "sha256-OlwIcfseJSN/f57T3g0OcBPQ/KvtquV51nJqNcd2Q7I=";
hash = "sha256-vTmHF7qoAWfou27v6TRPSRvLB+ge/7/aBgW6Bb7tkkI=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "lms";
version = "3.60.0";
version = "3.61.0";
src = fetchFromGitHub {
owner = "epoupon";
repo = "lms";
rev = "v${version}";
hash = "sha256-sLs73356BaFbKtyQc4cTFm7Wp/UemH8J+tkajXAA0do=";
hash = "sha256-q2LnJhIQYdjvVk+fQQ2tjoEw046DUR1o+RUG2bp/w3M=";
};
strictDeps = true;
+3 -3
View File
@@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "mainsail";
version = "2.12.0";
version = "2.13.0";
src = fetchFromGitHub {
owner = "mainsail-crew";
repo = "mainsail";
rev = "v${version}";
hash = "sha256-ZRs+KhHNQIGXy/3MUNM5OUuWSntfjYsW3d0OOvuvdAQ=";
hash = "sha256-1DpGfCa1jw6PO/a1dfsA4Oo5J1NqE4vlEbF0KKbwM4w=";
};
npmDepsHash = "sha256-du1X58wUTelgJO/0JYwxfHjjNpu1e4M1GDvx6tgz8Zw=";
npmDepsHash = "sha256-jOuIV6yR7hIPYRiAy5odxk8LreHiVTlZ03stwV2Nf4o=";
# Prevent Cypress binary download.
CYPRESS_INSTALL_BINARY = 0;
+73
View File
@@ -0,0 +1,73 @@
{
cmake,
doxygen,
fetchFromGitHub,
jrl-cmakemodules,
lib,
pinocchio,
pkg-config,
python3Packages,
pythonSupport ? false,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ndcurves";
version = "1.4.1";
src = fetchFromGitHub {
owner = "loco-3d";
repo = "ndcurves";
rev = "v${finalAttrs.version}";
hash = "sha256-XJ3VSSGKSJ+x3jc4408PGHTYg3nC7o/EeFnbKBELefs=";
};
outputs = [
"out"
"doc"
];
strictDeps = true;
nativeBuildInputs =
[
cmake
doxygen
pkg-config
]
++ lib.optionals pythonSupport [
python3Packages.python
python3Packages.pythonImportsCheckHook
];
propagatedBuildInputs =
[ jrl-cmakemodules ]
++ lib.optionals pythonSupport [
python3Packages.eigenpy
python3Packages.pinocchio
]
++ lib.optional (!pythonSupport) pinocchio;
cmakeFlags =
[
(lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
(lib.cmakeBool "CURVES_WITH_PINOCCHIO_SUPPORT" true)
]
++ lib.optional stdenv.hostPlatform.isAarch64 (
lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'curves_tests|python-curves'"
)
++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) (
lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test-so3-smooth'"
);
doCheck = true;
pythonImportsCheck = [ "ndcurves" ];
meta = {
description = "Library for creating smooth cubic splines";
homepage = "https://github.com/loco-3d/ndcurves";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.nim65s ];
platforms = lib.platforms.unix;
};
})
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGo122Module, fetchFromGitHub }:
buildGoModule rec {
buildGo122Module rec {
pname = "nexttrace";
version = "1.3.5";
+2 -2
View File
@@ -2,9 +2,9 @@
buildDotnetGlobalTool {
pname = "pbm";
version = "1.3.2";
version = "1.4.3";
nugetHash = "sha256-xu3g8NFLZYnHzBuoIhIiAzaPJqY0xhLWLYi+ORRADH8=";
nugetHash = "sha256-R6dmF3HPI2BAcNGLCm6WwBlk4ev6T6jaiJUAWYKf2S4=";
meta = with lib; {
description = "CLI for managing Akka.NET applications and Akka.NET Clusters";
+2 -2
View File
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "photoqt";
version = "4.6";
version = "4.7";
src = fetchurl {
url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
hash = "sha256-5VbGMJ1B9yDbTiri7SZ+r+c9LdfG/C1c0/01QBUvbCY=";
hash = "sha256-uZCeJJsQoIDZ6nf+JbFhbXE4ZHL8pCY0pJOG5w6v4vs=";
};
nativeBuildInputs = [
@@ -0,0 +1,34 @@
{
lib,
buildGoModule,
fetchFromGitHub,
pkg-config,
libvirt,
}:
buildGoModule rec {
pname = "prometheus-libvirt-exporter";
version = "2.3.3";
src = fetchFromGitHub {
owner = "Tinkoff";
repo = "libvirt-exporter";
rev = "refs/tags/${version}";
hash = "sha256-loh7fgeF1/OuTt2MQSkl/7VnX25idoF57+HtzV9L/ns=";
};
vendorHash = null;
ldflags = [ "-X=main.Version=${version}" ];
buildInputs = [ libvirt ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
description = "Prometheus metrics exporter for libvirt";
homepage = "https://github.com/Tinkoff/libvirt-exporter";
license = licenses.asl20;
maintainers = with maintainers; [ farcaller ];
};
}
+15 -13
View File
@@ -1,14 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa, nix-update-script }:
{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa, nix-update-script }:
buildGoModule rec {
pname = "rosa";
version = "1.2.46";
version = "1.2.48";
src = fetchFromGitHub {
owner = "openshift";
repo = "rosa";
rev = "v${version}";
hash = "sha256-XRoHapuH0MJNrtu+Rk/yxJqeqjNIbdGYqDB84q05rdA=";
hash = "sha256-qJKzJrCZKhaqoRxloTUqaRsR4/X/hoMxmDQCTNccTqk=";
};
vendorHash = null;
@@ -16,17 +16,19 @@ buildGoModule rec {
__darwinAllowLocalNetworking = true;
postPatch = ''
# e2e tests require network access
rm -r tests/e2e
'';
# skip e2e tests package
excludedPackages = [ "tests/e2e" ];
preCheck = ''
# Workaround for cmd/list/rhRegion/cmd_test.go:39
# Failed to get OCM regions: Can't retrieve shards: Get "https://api.stage.openshift.com/static/ocm-shards.json": dial tcp: lookup api.stage.openshift.com on [::1]:53: read udp [::1]:55793->[::1]:53: read: connection refused
substituteInPlace "cmd/list/rhRegion/cmd_test.go" \
--replace-fail "TestRhRegionCommand" "SkipRhRegionCommand"
'';
# skip tests that require network access
checkFlags =
let
skippedTests = [
"TestCluster"
"TestRhRegionCommand"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestCache" ];
in
[ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
+1 -1
View File
@@ -45,7 +45,7 @@ let
cat << EOF > $out/bin/${pname}
#!${stdenvNoCC.shell}
${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX
${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX "\$@"
EOF
chmod +x $out/bin/${pname}
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tgt";
version = "1.0.93";
version = "1.0.94";
src = fetchFromGitHub {
owner = "fujita";
repo = pname;
rev = "v${version}";
hash = "sha256-0Yfah8VxmbBe1J1OMhG6kyHlGBBAed8F9uStjMs6S2E=";
hash = "sha256-4zPTAdAXO8Km8a50ST3mdHW3RlKD1pmLACeFOY48lv0=";
};
nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ];
@@ -1,9 +1,9 @@
{ lib, buildDotnetGlobalTool }:
buildDotnetGlobalTool {
pname = "upgrade-assistant";
version = "0.5.820";
version = "0.5.829";
nugetHash = "sha256-GB+q5aZRkBTeXUbIPjkPsll6pSI/H6Iyh5mY53uT284=";
nugetHash = "sha256-N0xEmPQ88jfirGPLJykeAJQYGwELFzKwUWdFxIgiwhY=";
meta = {
homepage = "https://github.com/dotnet/upgrade-assistant";
+2 -2
View File
@@ -18,7 +18,7 @@
python3Packages.buildPythonApplication rec {
pname = "upscaler";
version = "1.4.0";
version = "1.4.1";
pyproject = false; # meson instead of pyproject
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
owner = "World";
repo = "Upscaler";
rev = version;
hash = "sha256-Dy8tykIbK5o0XulurG+TxORZZSxfRe5Kjh6aGpsh+0Y=";
hash = "sha256-WjhefFyd1hnngD/uIvgjAI4i6AyoldDJKWocvotGw9g=";
};
passthru.updateScript = gitUpdater { };
+16 -9
View File
@@ -1,20 +1,24 @@
{ lib
, undmg
, makeWrapper
, fetchurl
, stdenvNoCC
{
lib,
undmg,
makeWrapper,
fetchurl,
stdenvNoCC,
}:
stdenvNoCC.mkDerivation rec {
pname = "utm";
version = "4.5.4";
version = "4.6.2";
src = fetchurl {
url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
hash = "sha256-GzwokK/q8S38lbOVhGgNaqbDAAryHJ9eBAAWGpuOQOE=";
hash = "sha256-M4R0uSAX0MUTUCsPtdRMPESFET9AEQBtjvM7eTcRCas=";
};
nativeBuildInputs = [ undmg makeWrapper ];
nativeBuildInputs = [
undmg
makeWrapper
];
sourceRoot = ".";
installPhase = ''
@@ -62,6 +66,9 @@ stdenvNoCC.mkDerivation rec {
license = licenses.asl20;
platforms = platforms.darwin; # 11.3 is the minimum supported version as of UTM 4.
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ rrbutani wegank ];
maintainers = with maintainers; [
rrbutani
wegank
];
};
}
+40
View File
@@ -0,0 +1,40 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "wgsl-analyzer";
version = "0.8.1";
src = fetchFromGitHub {
owner = "wgsl-analyzer";
repo = "wgsl-analyzer";
rev = "refs/tags/v${version}";
hash = "sha256-bhosTihbW89vkqp1ua0C1HGLJJdCNfRde98z4+IjkOc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-+SeVxobUh2o2xNVBgXf1AgGI6hpNkoDNzXcKfabKEVc=";
checkFlags = [
# Imports failures
"--skip=tests::parse_import"
"--skip=tests::parse_import_colon"
"--skip=tests::parse_string_import"
"--skip=tests::struct_recover_3"
];
meta = {
description = "Language server implementation for the WGSL shading language";
homepage = "https://github.com/wgsl-analyzer/wgsl-analyzer";
changelog = "https://github.com/wgsl-analyzer/wgsl-analyzer/releases/tag/v${version}";
license = with lib.licenses; [
asl20
mit
];
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "wgsl-analyzer";
};
}
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qtutilities";
version = "6.14.3";
version = "6.14.4";
src = fetchFromGitHub {
owner = "Martchus";
repo = "qtutilities";
rev = "v${finalAttrs.version}";
hash = "sha256-WgZZEs3Fse+0+FLVO1GTkxqxzZPfJuxS7Ij/G0ACZSY=";
hash = "sha256-98njVyEK4cFe7QqCg++74t0YTv5zp80QKpTz4JlV+LY=";
};
nativeBuildInputs = [
@@ -97,6 +97,7 @@ mapAliases {
inherit (pkgs) firebase-tools; # added 2023-08-18
inherit (pkgs) fixjson; # added 2024-06-26
flood = pkgs.flood; # Added 2023-07-25
ganache = throw "ganache was removed because it was deprecated upstream"; # added 2024-12-02
generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24
inherit (pkgs) git-run; # added 2024-06-26
git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21
@@ -92,7 +92,6 @@
, "fleek-cli"
, "forever"
, "fx"
, "ganache"
, "gatsby-cli"
, "@gitbeaker/cli"
, "graphql"
-226
View File
@@ -9949,15 +9949,6 @@ let
sha512 = "C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==";
};
};
"@trufflesuite/uws-js-unofficial-20.30.0-unofficial.0" = {
name = "_at_trufflesuite_slash_uws-js-unofficial";
packageName = "@trufflesuite/uws-js-unofficial";
version = "20.30.0-unofficial.0";
src = fetchurl {
url = "https://registry.npmjs.org/@trufflesuite/uws-js-unofficial/-/uws-js-unofficial-20.30.0-unofficial.0.tgz";
sha512 = "r5X0aOQcuT6pLwTRLD+mPnAM/nlKtvIK4Z+My++A8tTOR0qTjNRx8UB8jzRj3D+p9PMAp5LnpCUUGmz7/TppwA==";
};
};
"@trysound/sax-0.2.0" = {
name = "_at_trysound_slash_sax";
packageName = "@trysound/sax";
@@ -10093,15 +10084,6 @@ let
sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw==";
};
};
"@types/bn.js-5.1.6" = {
name = "_at_types_slash_bn.js";
packageName = "@types/bn.js";
version = "5.1.6";
src = fetchurl {
url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.6.tgz";
sha512 = "Xh8vSwUeMKeYYrj3cX4lGQgFSF/N03r+tv4AiLl1SucqV+uTQpxRcnM8AkXKHwYP9ZPXOYXRr2KPXpVlIvqh9w==";
};
};
"@types/body-parser-1.19.5" = {
name = "_at_types_slash_body-parser";
packageName = "@types/body-parser";
@@ -10516,15 +10498,6 @@ let
sha512 = "8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==";
};
};
"@types/lru-cache-5.1.1" = {
name = "_at_types_slash_lru-cache";
packageName = "@types/lru-cache";
version = "5.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz";
sha512 = "ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==";
};
};
"@types/markdown-it-14.1.2" = {
name = "_at_types_slash_markdown-it";
packageName = "@types/markdown-it";
@@ -10858,15 +10831,6 @@ let
sha512 = "3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw==";
};
};
"@types/seedrandom-3.0.1" = {
name = "_at_types_slash_seedrandom";
packageName = "@types/seedrandom";
version = "3.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-3.0.1.tgz";
sha512 = "giB9gzDeiCeloIXDgzFBCgjj1k4WxcDrZtGl6h1IqmUPlxF+Nx8Ve+96QCyDZ/HseB/uvDsKbpib9hU5cU53pw==";
};
};
"@types/semver-7.5.8" = {
name = "_at_types_slash_semver";
packageName = "@types/semver";
@@ -12469,24 +12433,6 @@ let
sha512 = "JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==";
};
};
"abstract-level-1.0.3" = {
name = "abstract-level";
packageName = "abstract-level";
version = "1.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/abstract-level/-/abstract-level-1.0.3.tgz";
sha512 = "t6jv+xHy+VYwc4xqZMn2Pa9DjcdzvzZmQGRjTFc8spIbRGHgBrEKbPq+rYXc7CCo0lxgYvSgKVg9qZAhpVQSjA==";
};
};
"abstract-leveldown-7.2.0" = {
name = "abstract-leveldown";
packageName = "abstract-leveldown";
version = "7.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz";
sha512 = "DnhQwcFEaYsvYDnACLZhMmCWd3rkOeEvglpa4q5i/5Jlm3UIsWaxVzuXvDLFCSCWRO3yy2/+V/G7FusFgejnfQ==";
};
};
"abstract-logging-1.0.0" = {
name = "abstract-logging";
packageName = "abstract-logging";
@@ -14008,15 +13954,6 @@ let
sha512 = "p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==";
};
};
"async-eventemitter-0.2.4" = {
name = "async-eventemitter";
packageName = "async-eventemitter";
version = "0.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/async-eventemitter/-/async-eventemitter-0.2.4.tgz";
sha512 = "pd20BwL7Yt1zwDFy+8MX8F1+WCT8aQeKj0kQnTrH9WaeRETlRamVhD0JtRPmrV4GfOJ2F9CvdQkZeZhnh2TuHw==";
};
};
"async-limiter-1.0.1" = {
name = "async-limiter";
packageName = "async-limiter";
@@ -15772,24 +15709,6 @@ let
sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==";
};
};
"bufferutil-4.0.5" = {
name = "bufferutil";
packageName = "bufferutil";
version = "4.0.5";
src = fetchurl {
url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.5.tgz";
sha512 = "HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A==";
};
};
"bufferutil-4.0.7" = {
name = "bufferutil";
packageName = "bufferutil";
version = "4.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz";
sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==";
};
};
"bufferutil-4.0.8" = {
name = "bufferutil";
packageName = "bufferutil";
@@ -16339,15 +16258,6 @@ let
sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==";
};
};
"catering-2.1.1" = {
name = "catering";
packageName = "catering";
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/catering/-/catering-2.1.1.tgz";
sha512 = "K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w==";
};
};
"catharsis-0.9.0" = {
name = "catharsis";
packageName = "catharsis";
@@ -21993,15 +21903,6 @@ let
sha256 = "017c2be5bb31d76e87a1910024d0e420e05aa7c1f4f0b0c792e15d0746ae77a6";
};
};
"emittery-0.10.0" = {
name = "emittery";
packageName = "emittery";
version = "0.10.0";
src = fetchurl {
url = "https://registry.npmjs.org/emittery/-/emittery-0.10.0.tgz";
sha512 = "AGvFfs+d0JKCJQ4o01ASQLGPmSCxgfU9RFXvzPvZdjKK8oscynksuJhWrSTSw7j7Ep/sZct5b5ZhYCi8S/t0HQ==";
};
};
"emoji-regex-10.4.0" = {
name = "emoji-regex";
packageName = "emoji-regex";
@@ -32443,42 +32344,6 @@ let
sha512 = "DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==";
};
};
"level-concat-iterator-3.1.0" = {
name = "level-concat-iterator";
packageName = "level-concat-iterator";
version = "3.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-3.1.0.tgz";
sha512 = "BWRCMHBxbIqPxJ8vHOvKUsaO0v1sLYZtjN3K2iZJsRBYtp+ONsY6Jfi6hy9K3+zolgQRryhIn2NRZjZnWJ9NmQ==";
};
};
"level-supports-2.1.0" = {
name = "level-supports";
packageName = "level-supports";
version = "2.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/level-supports/-/level-supports-2.1.0.tgz";
sha512 = "E486g1NCjW5cF78KGPrMDRBYzPuueMZ6VBXHT6gC7A8UYWGiM14fGgp+s/L1oFfDWSPV/+SFkYCmZ0SiESkRKA==";
};
};
"level-supports-4.0.1" = {
name = "level-supports";
packageName = "level-supports";
version = "4.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/level-supports/-/level-supports-4.0.1.tgz";
sha512 = "PbXpve8rKeNcZ9C1mUicC9auIYFyGpkV9/i6g76tLgANwWhtG2v7I4xNBUlkn3lE2/dZF3Pi0ygYGtLc4RXXdA==";
};
};
"level-transcoder-1.0.1" = {
name = "level-transcoder";
packageName = "level-transcoder";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/level-transcoder/-/level-transcoder-1.0.1.tgz";
sha512 = "t7bFwFtsQeD8cl8NIoQ2iwxA0CL/9IFw7/9gAjOonH0PWTTiRfY7Hq+Ejbsxh86tXobDQ6IOiddjNYIfOBs06w==";
};
};
"leven-3.1.0" = {
name = "leven";
packageName = "leven";
@@ -36665,15 +36530,6 @@ let
sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==";
};
};
"module-error-1.0.2" = {
name = "module-error";
packageName = "module-error";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/module-error/-/module-error-1.0.2.tgz";
sha512 = "0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA==";
};
};
"mold-source-map-0.4.1" = {
name = "mold-source-map";
packageName = "mold-source-map";
@@ -51984,24 +51840,6 @@ let
sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==";
};
};
"utf-8-validate-5.0.7" = {
name = "utf-8-validate";
packageName = "utf-8-validate";
version = "5.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.7.tgz";
sha512 = "vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q==";
};
};
"utf-8-validate-6.0.3" = {
name = "utf-8-validate";
packageName = "utf-8-validate";
version = "6.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.3.tgz";
sha512 = "uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA==";
};
};
"utf-8-validate-6.0.4" = {
name = "utf-8-validate";
packageName = "utf-8-validate";
@@ -54360,15 +54198,6 @@ let
sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==";
};
};
"ws-8.13.0" = {
name = "ws";
packageName = "ws";
version = "8.13.0";
src = fetchurl {
url = "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz";
sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==";
};
};
"ws-8.17.1" = {
name = "ws";
packageName = "ws";
@@ -67505,61 +67334,6 @@ in
bypassCache = true;
reconstructLock = true;
};
ganache = nodeEnv.buildNodePackage {
name = "ganache";
packageName = "ganache";
version = "7.9.2";
src = fetchurl {
url = "https://registry.npmjs.org/ganache/-/ganache-7.9.2.tgz";
sha512 = "7gsVVDpO9AhrFyDMWWl7SpMsPpqGcnAzjxz3k32LheIPNd64p2XsY9GYRdhWmKuryb60W1iaWPZWDkFKlbRWHA==";
};
dependencies = [
(sources."@trufflesuite/uws-js-unofficial-20.30.0-unofficial.0" // {
dependencies = [
sources."bufferutil-4.0.7"
sources."utf-8-validate-6.0.3"
];
})
sources."@types/bn.js-5.1.6"
sources."@types/lru-cache-5.1.1"
sources."@types/node-22.5.5"
sources."@types/seedrandom-3.0.1"
sources."abstract-level-1.0.3"
(sources."abstract-leveldown-7.2.0" // {
dependencies = [
sources."level-supports-2.1.0"
];
})
sources."async-2.6.4"
sources."async-eventemitter-0.2.4"
sources."base64-js-1.5.1"
sources."buffer-6.0.3"
sources."bufferutil-4.0.5"
sources."catering-2.1.1"
sources."emittery-0.10.0"
sources."ieee754-1.2.1"
sources."is-buffer-2.0.5"
sources."level-concat-iterator-3.1.0"
sources."level-supports-4.0.1"
sources."level-transcoder-1.0.1"
sources."lodash-4.17.21"
sources."module-error-1.0.2"
sources."node-gyp-build-4.8.2"
sources."queue-microtask-1.2.3"
sources."undici-types-6.19.8"
sources."utf-8-validate-5.0.7"
sources."ws-8.13.0"
];
buildInputs = globalBuildInputs;
meta = {
description = "A library and cli to create a local blockchain for fast Ethereum development.";
homepage = "https://github.com/trufflesuite/ganache/tree/develop/packages/ganache#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
gatsby-cli = nodeEnv.buildNodePackage {
name = "gatsby-cli";
packageName = "gatsby-cli";
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "blis";
version = "1.0.1";
version = "1.0.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "explosion";
repo = "cython-blis";
rev = "refs/tags/release-v${version}";
hash = "sha256-8JaQgTda1EBiZdSrZtKwJ8e/aDENQ+dMmTiH/t1ax5I=";
hash = "sha256-J/EaJNmImcK4zScpbYPlQuoLyjoUkUgxUp6926P6rUQ=";
};
postPatch = ''
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "grad-cam";
version = "1.5.3";
version = "1.5.4";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-q9PcG836Az+2o1XqeKNh0+z9GN9UGinmGyOAhD5B3Zw=";
hash = "sha256-kgu6bM3XWFM/0d5P1ZbNzquPC7E4tnUnHpW2FKHwEUc=";
};
nativeBuildInputs = [
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyathena";
version = "3.9.0";
version = "3.10.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-SxHUnfAyVcVW4R9j0ONGzCXqGWdaeseP/QU3vNhMtI8=";
hash = "sha256-paFTmhPGr2qz1CK425tbSHEbexcl+lqmgoL6RZmfC2o=";
};
build-system = [ hatchling ];
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "reproject";
version = "0.14.0";
version = "0.14.1";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
hash = "sha256-3TxPd2CEmKWDlE1nC2GnXBUASe/DNgZnS1GJoRo5u8A=";
hash = "sha256-U8jqJ5uLVX8zoeQwr14FPNdHACRA4HK65q2TAtRr5Xk=";
};
postPatch = ''
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "streamdeck";
version = "0.9.5";
version = "0.9.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-BHliZrRFd64D+UD1xcpp2HAH4D0Z7tibawJobAMM65E=";
hash = "sha256-7ELZtxGzUuonStMFputI7OHu06W//nC5KOCC3OD3iPA=";
};
patches = [
@@ -1,45 +1,45 @@
{
lib,
stdenv,
buildPythonPackage,
click,
click-completion,
factory-boy,
faker,
fetchPypi,
inquirer,
notify-py,
fetchFromGitHub,
# build-system
pbr,
pendulum,
prettytable,
pytest-mock,
pytestCheckHook,
pytest-cov-stub,
pythonOlder,
requests,
setuptools,
twine,
# dependencies
click,
click-completion,
inquirer,
notify-py,
pendulum,
prettytable,
requests,
validate-email,
# tests
factory-boy,
pytest-cov-stub,
pytest-mock,
pytestCheckHook,
versionCheckHook,
}:
buildPythonPackage rec {
pname = "toggl-cli";
version = "2.4.4";
version = "3.0.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "togglCli";
inherit version;
hash = "sha256-P4pv6LMPIWXD04IQw01yo3z3voeV4OmsBOCSJgcrZ6g=";
src = fetchFromGitHub {
owner = "AuHau";
repo = "toggl-cli";
rev = "refs/tags/v${version}";
hash = "sha256-RYOnlZxg3TZQO5JpmWlnUdL2hNFu4bjkdGU4c2ysqpA=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace-fail "==" ">="
substituteInPlace pytest.ini \
--replace-fail ' -m "not premium"' ""
'';
env.PBR_VERSION = version;
build-system = [
pbr
@@ -47,6 +47,8 @@ buildPythonPackage rec {
twine
];
pythonRelaxDeps = true;
dependencies = [
click
click-completion
@@ -56,42 +58,41 @@ buildPythonPackage rec {
pendulum
prettytable
requests
setuptools
validate-email
];
nativeCheckInputs = [
pytestCheckHook
factory-boy
pytest-cov-stub
pytest-mock
faker
factory-boy
pytestCheckHook
versionCheckHook
];
preCheck = ''
export TOGGL_API_TOKEN=your_api_token
export TOGGL_PASSWORD=toggl_password
export TOGGL_USERNAME=user@example.com
'';
versionCheckProgram = "${placeholder "out"}/bin/toggl";
versionCheckProgramArg = [ "--version" ];
disabledTests = [
"integration"
"premium"
"test_basic_usage"
"test_now"
"test_parsing"
"test_type_check"
];
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
# PermissionError: [Errno 1] Operation not permitted: '/etc/localtime'
"tests/unit/cli/test_types.py"
];
pythonImportsCheck = [ "toggl" ];
# updates to a bogus tag
passthru.skipBulkUpdate = true;
meta = with lib; {
meta = {
description = "Command line tool and set of Python wrapper classes for interacting with toggl's API";
homepage = "https://toggl.uhlir.dev/";
license = licenses.mit;
maintainers = with maintainers; [ mmahut ];
changelog = "https://github.com/AuHau/toggl-cli/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ mmahut ];
mainProgram = "toggl";
};
}
@@ -364,13 +364,13 @@
buildPythonPackage rec {
pname = "types-aiobotocore";
version = "2.15.2";
version = "2.15.2.post3";
pyproject = true;
src = fetchPypi {
pname = "types_aiobotocore";
inherit version;
hash = "sha256-Y+akVszDPiyjUKrliM/bu5S97PNTPmqFePc2xbK4Vgc=";
hash = "sha256-Q/7wqPWvo4nwJVh0va051T8EbjeyMKWVRIBbADIyBjs=";
};
build-system = [ setuptools ];
+20 -7
View File
@@ -1,11 +1,21 @@
{ buildDotnetGlobalTool, lib }:
{
buildDotnetGlobalTool,
lib,
testers,
}:
buildDotnetGlobalTool {
buildDotnetGlobalTool (finalAttrs: {
pname = "fable";
version = "4.20.0";
version = "4.24.0";
nugetHash = "sha256-K3908gEbl9crT4wmZfBtvag5Z6qYABfalBfLZlqZuDk=";
passthru.updateScript = ./update.sh;
nugetHash = "sha256-ERewWqfEyyZKpHFFALpMGJT0fDWywBYY5buU/wTZZTg=";
passthru.tests = testers.testVersion {
package = finalAttrs.finalPackage;
# the version is written with an escape sequence for colour, and I couldn't
# find a way to disable it
version = "[37m${finalAttrs.version}";
};
meta = with lib; {
description = "Fable is an F# to JavaScript compiler";
@@ -14,6 +24,9 @@ buildDotnetGlobalTool {
changelog = "https://github.com/fable-compiler/fable/releases/tag/v${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ anpin mdarocha ];
maintainers = with maintainers; [
anpin
mdarocha
];
};
}
})
-39
View File
@@ -1,39 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix-prefetch jq
set -euo pipefail
URL="https://github.com/fable-compiler/fable"
PKG="Fable"
ROOT="$(dirname "$(readlink -f "$0")")"
NIX_DRV="$ROOT/default.nix"
if [ ! -f "$NIX_DRV" ]; then
echo "ERROR: cannot find default.nix in $ROOT"
exit 1
fi
TMP="$(mktemp -d)"
clean_up() {
rm -rf "$TMP"
}
trap clean_up EXIT SIGINT SIGTERM
PACKAGES="$TMP/packages"
SRC_RW="$TMP/src"
mkdir -p $SRC_RW
mkdir -p $PACKAGES
VER=$(curl -s "https://api.github.com/repos/fable-compiler/fable/releases/latest" | jq -r .tag_name | grep -oP '\d+\.\d+\.\d+' )
CURRENT_VER=$(grep -oP '(?<=version = ")[^"]+' "$NIX_DRV")
if [[ "$CURRENT_VER" == "$VER" ]]; then
echo "$PKG is already up to date: $CURRENT_VER"
exit
fi
NUGET_URL="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')$PKG/$VER/$PKG.$VER.nupkg"
HASH=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$NUGET_URL")")
sed -i "s/version = \".*\"/version = \"$VER\"/" "$NIX_DRV"
sed -i "s#nugetHash = \"sha256-.\{44\}\"#nugetHash = \"$HASH\"#" "$NIX_DRV"
+5 -1
View File
@@ -190,7 +190,11 @@ stdenv.mkDerivation rec {
'';
license = licenses.agpl3Plus;
homepage = "https://joinpeertube.org/";
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
platforms = [
"x86_64-linux" "aarch64-linux"
# feasible, looking for maintainer to help out
# "x86_64-darwin" "aarch64-darwin"
];
maintainers = with maintainers; [ immae izorkin stevenroose ];
};
}
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "sslscan";
version = "2.1.5";
version = "2.1.6";
src = fetchFromGitHub {
owner = "rbsec";
repo = "sslscan";
rev = "refs/tags/${version}";
hash = "sha256-K0OJvb9jym7P6ehtV5M/edq4ZKwacn8D5IC4PyttqZY=";
hash = "sha256-XFoTwBtufkT/Ja0a3MEytPHx37eg3ZZ7x15EXHjZey4=";
};
buildInputs = [ openssl ];
+2
View File
@@ -8960,6 +8960,8 @@ self: super: with self; {
natural = callPackage ../development/python-modules/natural { };
ndcurves = toPythonModule (pkgs.ndcurves.override { python3Packages = self; pythonSupport = true; });
nomadnet = callPackage ../development/python-modules/nomadnet { };
noneprompt = callPackage ../development/python-modules/noneprompt { };