Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-02-15 00:14:49 +00:00
committed by GitHub
172 changed files with 3864 additions and 10686 deletions
+6
View File
@@ -7504,6 +7504,12 @@
name = "A Frederick Christensen";
keys = [ { fingerprint = "5A49 F4F9 3EDC 21E9 B7CC 4E94 9EEF 4142 5355 8AC4"; } ];
};
fazzi = {
email = "faaris.ansari@proton.me";
github = "fxzzi";
githubId = 18248986;
name = "Faaris Ansari";
};
fbeffa = {
email = "beffa@fbengineering.ch";
github = "fedeinthemix";
+2 -16
View File
@@ -246,22 +246,8 @@ in
RestrictRealtime = true;
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service"
"@resources"
"~@clock"
"@debug"
"@module"
"@mount"
"@reboot"
"@swap"
"@cpu-emulation"
"@obsolete"
"@timer"
"@chown"
"@setuid"
"@privileged"
"@keyring"
"@ipc"
"@system-service @resources"
"~@clock @debug @module @mount @reboot @swap @cpu-emulation @obsolete @timer @chown @setuid @privileged @keyring @ipc"
];
SystemCallErrorNumber = "EPERM";
+154 -138
View File
@@ -1,76 +1,77 @@
{ lib
, stdenv
, fetchgit
, fetchzip
, alsa-lib
, aubio
, boost
, cairomm
, cppunit
, curl
, dbus
, doxygen
, ffmpeg
, fftw
, fftwSinglePrec
, flac
, fluidsynth
, glibc
, glibmm
, graphviz
, gtkmm2
, harvid
, hidapi
, itstool
, kissfft
, libarchive
, libjack2
, liblo
, libltc
, libogg
, libpulseaudio
, librdf_rasqal
, libsamplerate
, libsigcxx
, libsndfile
, libusb1
, libuv
, libwebsockets
, libxml2
, libxslt
, lilv
, lrdf
, lv2
, makeWrapper
, pango
, perl
, pkg-config
, python3
, qm-dsp
, readline
, rubberband
, serd
, sord
, soundtouch
, sratom
, suil
, taglib
, vamp-plugin-sdk
, wafHook
, xjadeo
, optimize ? true # disable to print Lua DSP script output to stdout
, videoSupport ? true
{
lib,
stdenv,
fetchgit,
fetchzip,
alsa-lib,
aubio,
boost,
cairomm,
cppunit,
curl,
dbus,
doxygen,
ffmpeg,
fftw,
fftwSinglePrec,
flac,
fluidsynth,
glibc,
glibmm,
graphviz,
gtkmm2,
harvid,
hidapi,
itstool,
kissfft,
libarchive,
libjack2,
liblo,
libltc,
libogg,
libpulseaudio,
librdf_rasqal,
libsamplerate,
libsigcxx,
libsndfile,
libusb1,
libuv,
libwebsockets,
libxml2,
libxslt,
lilv,
lrdf,
lv2,
makeWrapper,
pango,
perl,
pkg-config,
python3,
qm-dsp,
readline,
rubberband,
serd,
sord,
soundtouch,
sratom,
suil,
taglib,
vamp-plugin-sdk,
wafHook,
xjadeo,
optimize ? true, # disable to print Lua DSP script output to stdout
videoSupport ? true,
}:
stdenv.mkDerivation rec {
pname = "ardour";
version = "8.10";
version = "8.11";
# We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
# result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git";
rev = version;
hash = "sha256-y4eNo0ukRL6v0T1XvJ46sYnsiVSdL527punnkmf/TIU=";
hash = "sha256-z+rIWFVua1IG4GZ8kH3quKaBbN+I7Yr62vukJZk6KAg=";
};
bundledContent = fetchzip {
@@ -93,8 +94,8 @@ stdenv.mkDerivation rec {
sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
patchShebangs ./tools/
substituteInPlace libs/ardour/video_tools_paths.cc \
--replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
--replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
--replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
--replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
'';
nativeBuildInputs = [
@@ -108,56 +109,61 @@ stdenv.mkDerivation rec {
wafHook
];
buildInputs = [
alsa-lib
aubio
boost
cairomm
cppunit
curl
dbus
ffmpeg
fftw
fftwSinglePrec
flac
fluidsynth
glibmm
gtkmm2
hidapi
itstool
kissfft
libarchive
libjack2
liblo
libltc
libogg
libpulseaudio
librdf_rasqal
libsamplerate
libsigcxx
libsndfile
libusb1
libuv
libwebsockets
libxml2
libxslt
lilv
lrdf
lv2
pango
perl
python3
qm-dsp
readline
rubberband
serd
sord
soundtouch
sratom
suil
taglib
vamp-plugin-sdk
] ++ lib.optionals videoSupport [ harvid xjadeo ];
buildInputs =
[
alsa-lib
aubio
boost
cairomm
cppunit
curl
dbus
ffmpeg
fftw
fftwSinglePrec
flac
fluidsynth
glibmm
gtkmm2
hidapi
itstool
kissfft
libarchive
libjack2
liblo
libltc
libogg
libpulseaudio
librdf_rasqal
libsamplerate
libsigcxx
libsndfile
libusb1
libuv
libwebsockets
libxml2
libxslt
lilv
lrdf
lv2
pango
perl
python3
qm-dsp
readline
rubberband
serd
sord
soundtouch
sratom
suil
taglib
vamp-plugin-sdk
]
++ lib.optionals videoSupport [
harvid
xjadeo
];
wafConfigureFlags = [
"--cxx17"
@@ -175,29 +181,36 @@ stdenv.mkDerivation rec {
# "--use-external-libs"
] ++ lib.optional optimize "--optimize";
postInstall = ''
# wscript does not install these for some reason
install -vDm 644 "build/gtk2_ardour/ardour.xml" \
-t "$out/share/mime/packages"
install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \
-t "$out/share/applications"
for size in 16 22 32 48 256 512; do
install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
"$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png"
done
install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
postInstall =
''
# wscript does not install these for some reason
install -vDm 644 "build/gtk2_ardour/ardour.xml" \
-t "$out/share/mime/packages"
install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \
-t "$out/share/applications"
for size in 16 22 32 48 256 512; do
install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
"$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png"
done
install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
# install additional bundled beats, chords and progressions
cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media"
'' + lib.optionalString videoSupport ''
# `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
wrapProgram "$out/bin/ardour${lib.versions.major version}" \
--prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}"
'';
# install additional bundled beats, chords and progressions
cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media"
''
+ lib.optionalString videoSupport ''
# `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
wrapProgram "$out/bin/ardour${lib.versions.major version}" \
--prefix PATH : "${
lib.makeBinPath [
harvid
xjadeo
]
}"
'';
LINKFLAGS = "-lpthread";
meta = with lib; {
meta = {
description = "Multi-track hard disk recording software";
longDescription = ''
Ardour is a digital audio workstation (DAW), You can use it to
@@ -209,9 +222,12 @@ stdenv.mkDerivation rec {
https://community.ardour.org/donate
'';
homepage = "https://ardour.org/";
license = licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
mainProgram = "ardour8";
platforms = platforms.linux;
maintainers = with maintainers; [ magnetophon mitchmindtree ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
magnetophon
mitchmindtree
];
};
}
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "cortex-debug";
publisher = "marus25";
version = "1.6.10";
hash = "sha256-6b3JDkX6Xd91VE1h7gYyeukxLsBkn/nNzDQgBm0axRA=";
version = "1.12.1";
hash = "sha256-ioK6gwtkaAcfxn11lqpwhrpILSfft/byeEqoEtJIfM0=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/marus25.cortex-debug/changelog";
@@ -43,8 +43,8 @@ function get_vsixpkg() {
curl --silent --show-error --retry 3 --fail -X GET -o "$EXTTMP/$N.zip" "$URL"
# Unpack the file we need to stdout then pull out the version
VER=$(jq -r '.version' <(unzip -qc "$EXTTMP/$N.zip" "extension/package.json"))
# Calculate the SHA
SHA=$(nix-hash --flat --base32 --type sha256 "$EXTTMP/$N.zip")
# Calculate the hash
HASH=$(nix-hash --flat --sri --type sha256 "$EXTTMP/$N.zip")
# Clean up.
rm -Rf "$EXTTMP"
@@ -55,7 +55,7 @@ function get_vsixpkg() {
name = "$2";
publisher = "$1";
version = "$VER";
sha256 = "$SHA";
hash = "$HASH";
}
EOF
}
@@ -11,13 +11,13 @@
buildDotnetModule rec {
pname = "ArchiSteamFarm";
# nixpkgs-update: no auto update
version = "6.1.1.3";
version = "6.1.2.3";
src = fetchFromGitHub {
owner = "JustArchiNET";
repo = "ArchiSteamFarm";
rev = version;
hash = "sha256-e0LzM0N5N7BHyQDRQIPziQrAilJN1aUttKyLod/T8rU=";
hash = "sha256-FYh54KE42DizwpleBquDP7CNLHJySSz5pjsfjpn63u8=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
+82 -72
View File
@@ -281,14 +281,19 @@
},
{
"pname": "Markdig.Signed",
"version": "0.39.1",
"hash": "sha256-jofkP6JUp4xuUjJ6B6+HDfBJ3+V2vgECt2CWmFq62k4="
"version": "0.40.0",
"hash": "sha256-msd36cVKi3MTkT1QQg/b5yW4oLM3e8hbahPPkvhzRZw="
},
{
"pname": "Microsoft.ApplicationInsights",
"version": "2.22.0",
"hash": "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="
},
{
"pname": "Microsoft.AspNetCore.OpenApi",
"version": "9.0.1",
"hash": "sha256-L93MBkDOrxiQx0YRZrxDwli7to5Va5+7VJFffyhk8cE="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "6.0.0",
@@ -296,8 +301,8 @@
},
{
"pname": "Microsoft.CodeAnalysis.ResxSourceGenerator",
"version": "3.11.0-beta1.24527.2",
"hash": "sha256-NVqJ5cRa9G+ilWKazOTA8Xfm6ExOPpst8HMIFBC1/BU="
"version": "3.11.0-beta1.24605.2",
"hash": "sha256-N+A3i0qC364THr1rmehG168V3W+3xXaQYIjgFE1zO6Q="
},
{
"pname": "Microsoft.CodeCoverage",
@@ -426,23 +431,23 @@
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "8.3.0",
"hash": "sha256-LSZ91DbPswCWibHNSGWC3Jh3KQwAthVaU3r7XQJyutM="
"version": "8.3.1",
"hash": "sha256-K2ahV9EZFZD7idRzF0wKD/5FD7BuSiRtSNuFAqauo1Y="
},
{
"pname": "Microsoft.IdentityModel.JsonWebTokens",
"version": "8.3.0",
"hash": "sha256-Hiiv10LSOMIt7KsQSsteJV4DFkLebHMYmoISn/pl2F8="
"version": "8.3.1",
"hash": "sha256-laNV7ziGznCb7TuYO6987C62To870os1az4YbhG84vc="
},
{
"pname": "Microsoft.IdentityModel.Logging",
"version": "8.3.0",
"hash": "sha256-0P14ilpV+9yp+nqZWI/ilkTnRas4pic8NjNVcYxuXWs="
"version": "8.3.1",
"hash": "sha256-uLgVE2ZCiz5F3/SMes+nNEqXNEdDH0vfUk3eOv3MXbU="
},
{
"pname": "Microsoft.IdentityModel.Tokens",
"version": "8.3.0",
"hash": "sha256-+TzBeZH2Tgs0EMoU5QuCdOD/5V8xM7MHClX578AUIxw="
"version": "8.3.1",
"hash": "sha256-C9Aj8YZ7corhP6LOCx/fBXbyAR9baqzQtFvhsGeQ/Mo="
},
{
"pname": "Microsoft.NET.Test.Sdk",
@@ -454,6 +459,11 @@
"version": "5.0.0",
"hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
},
{
"pname": "Microsoft.OpenApi",
"version": "1.6.17",
"hash": "sha256-Wx9PwlEJPNMq1kp59nJJnLHQ+yNhqCTudcokmlP+tSk="
},
{
"pname": "Microsoft.OpenApi",
"version": "1.6.22",
@@ -461,28 +471,28 @@
},
{
"pname": "Microsoft.Testing.Extensions.Telemetry",
"version": "1.5.0",
"hash": "sha256-aKKGFpsp88Yy29GLbWRWnEil2M2WEHjRXZ62Q8x5QRQ="
"version": "1.5.3",
"hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU="
},
{
"pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
"version": "1.5.0",
"hash": "sha256-oiePvWpZMkT2AnEpfzWgvaXJai6crgHdoUSMZct3JB0="
"version": "1.5.3",
"hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc="
},
{
"pname": "Microsoft.Testing.Extensions.VSTestBridge",
"version": "1.5.0",
"hash": "sha256-XauIF+r05RDgORsnxEp6Cq0WZjLycJ1hPH79QUi/SgM="
"version": "1.5.3",
"hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g="
},
{
"pname": "Microsoft.Testing.Platform",
"version": "1.5.0",
"hash": "sha256-67ZNhvMifCIM7SFnwDN25EanRNKsjAFQWugrrYWAkrM="
"version": "1.5.3",
"hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM="
},
{
"pname": "Microsoft.Testing.Platform.MSBuild",
"version": "1.5.0",
"hash": "sha256-nJ5fv8MwFw2PeJIZA9qKLfGPWYKmHww1CtVFICz6S00="
"version": "1.5.3",
"hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
@@ -501,23 +511,23 @@
},
{
"pname": "MSTest",
"version": "3.7.0",
"hash": "sha256-z302okYPT36ebQhReEihire5fyig5pLkrx09nLyVuME="
"version": "3.7.3",
"hash": "sha256-0fFXB4ZYX+RFntYFin9SrgiW/neD7iXEHF+nJoN6Iys="
},
{
"pname": "MSTest.Analyzers",
"version": "3.7.0",
"hash": "sha256-TVMFle7oE2ZU6U+VkJ0G9iNjJxnRU4rDIJCtZFwDhz0="
"version": "3.7.3",
"hash": "sha256-6mNfHtx9FBWA6/QrRUepwbxXWG/54GRyeZYazDiMacg="
},
{
"pname": "MSTest.TestAdapter",
"version": "3.7.0",
"hash": "sha256-b6JCu2yyZmTZwZVd4MHaIwa01eQGWpFd8mNzHUBS6Tg="
"version": "3.7.3",
"hash": "sha256-3O/AXeS+3rHWstinivt73oa0QDp+xQpTc9p46EF+Mtc="
},
{
"pname": "MSTest.TestFramework",
"version": "3.7.0",
"hash": "sha256-fIHwuc/zimd8oxvTiA3gmUzmJAj7JsQYh9IOb8NRJ/Y="
"version": "3.7.3",
"hash": "sha256-RweCMMf14GI6HqjDIP68JM67IaJKYQTZy0jk5Q4DFxs="
},
{
"pname": "Newtonsoft.Json",
@@ -546,23 +556,23 @@
},
{
"pname": "NLog",
"version": "5.3.4",
"hash": "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k="
"version": "5.4.0",
"hash": "sha256-l2R0UHHCL02KPMC96e62AL2ONFD0PAty619y9UnD25A="
},
{
"pname": "NLog.Extensions.Logging",
"version": "5.3.15",
"hash": "sha256-otzOJncsEmzeGkJ9yxuwQgYFlKIG9ALX+DaKJ/Jhux4="
"version": "5.4.0",
"hash": "sha256-9pVBguAKnjmbtKM3wBVBEzovXkoEXgqvB4IhiayAkVo="
},
{
"pname": "NLog.Web.AspNetCore",
"version": "5.3.15",
"hash": "sha256-JaxCAfsgYM8N7bmAciDowSdOxtMS3eoMszODqWPcqao="
"version": "5.4.0",
"hash": "sha256-tDCsOqYNVg+dNBk85HjNgbZuQwMgGPIdsMqoPhhPROk="
},
{
"pname": "OpenTelemetry",
"version": "1.10.0",
"hash": "sha256-ucUy3vIabYb0TGDhraqMEzT+LLPmXrO1NgAjEeyVCO8="
"version": "1.11.1",
"hash": "sha256-Z4U/FCSlY+qdQRS2haJDSYyxI624mDCwHZhf5At2Atk="
},
{
"pname": "OpenTelemetry",
@@ -571,13 +581,13 @@
},
{
"pname": "OpenTelemetry.Api",
"version": "1.10.0",
"hash": "sha256-ZSpQFnNgkk3dO8Q7yokJ/VSl4wp5PuIv9nduxgC6UxU="
"version": "1.11.1",
"hash": "sha256-1qDEHEvelvySuCPcevWgO7N9ZEmPXwnFog+tiWXr2qU="
},
{
"pname": "OpenTelemetry.Api.ProviderBuilderExtensions",
"version": "1.10.0",
"hash": "sha256-hLw3Sf1fviAlVJYhaMudVJEdG5pjX5JvVrqv9DgYAk8="
"version": "1.11.1",
"hash": "sha256-rioqazZAS6aZ7W8jJ4owu58rcnRbQyPrWVTBoqu1zPc="
},
{
"pname": "OpenTelemetry.Api.ProviderBuilderExtensions",
@@ -591,38 +601,38 @@
},
{
"pname": "OpenTelemetry.Extensions.Hosting",
"version": "1.10.0",
"hash": "sha256-+O9oaAUYaKUItLAaT7yQUs2nrHVDNkj8YcFuUxiTy6M="
"version": "1.11.1",
"hash": "sha256-eHQaUToWOpmJgD5XCHDCWsUcChKH3roaO8ZTAIulJVk="
},
{
"pname": "OpenTelemetry.Instrumentation.AspNetCore",
"version": "1.10.1",
"hash": "sha256-HqMFDpFsMaPlgyFt1MU3Un+BysEoj5qPc8HVxTlt0mE="
"version": "1.11.0",
"hash": "sha256-F3WTwCPVUe+VppF1ZOAdBKaSseKmFZEU7D81uegqpGo="
},
{
"pname": "OpenTelemetry.Instrumentation.Http",
"version": "1.10.0",
"hash": "sha256-U9ojqPSJu4OQEAfRJ+7MjzxayzsGWI0Ep8CPAcpkhhA="
"version": "1.11.0",
"hash": "sha256-4J7ZvginaiISaLB4M9tTK2o6avBz2dSI+fAhyfraBQ4="
},
{
"pname": "OpenTelemetry.Instrumentation.Runtime",
"version": "1.10.0",
"hash": "sha256-cCTYKxHh1Qzu8X51B8gGsrxwKhVSqJfiql/+o4TWrwg="
"version": "1.11.0",
"hash": "sha256-VBSSJ3eORWUlVH12xzubtMtrDACAsyd1nSfgUt5ltCg="
},
{
"pname": "protobuf-net",
"version": "3.2.45",
"hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA="
"version": "3.2.46",
"hash": "sha256-NirxAUXEIUQz0HHLS+KS4fgOZwJy1zJZYGcjPa5ujTs="
},
{
"pname": "protobuf-net.Core",
"version": "3.2.45",
"hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ="
"version": "3.2.46",
"hash": "sha256-Srg7pP7rleL462idLPFUxgXBLrywWeHFyEvSV+keA4E="
},
{
"pname": "SteamKit2",
"version": "3.0.0",
"hash": "sha256-bRRdX8WFo9k+QCZWh0KHb3TULpJxpR4Hg9FDXKBW6d4="
"version": "3.0.2",
"hash": "sha256-bRiLFaq/hsr+7BKtSKoD2+pf0VCGhBYe/rO3DgqMZpo="
},
{
"pname": "Swashbuckle.AspNetCore",
@@ -661,33 +671,33 @@
},
{
"pname": "System.Composition",
"version": "9.0.0",
"hash": "sha256-FehOkQ2u1p8mQ0/wn3cZ+24HjhTLdck8VZYWA1CcgbM="
"version": "9.0.1",
"hash": "sha256-KUJnkjMNNJ2b/1664xflRM9AmAs00PkmXLfbTnNdL6U="
},
{
"pname": "System.Composition.AttributedModel",
"version": "9.0.0",
"hash": "sha256-a7y7H6zj+kmYkllNHA402DoVfY9IaqC3Ooys8Vzl24M="
"version": "9.0.1",
"hash": "sha256-93Q8jFzbF0tEhk+UAHoULA+DWiwgrKiBxcm8k/dQ75M="
},
{
"pname": "System.Composition.Convention",
"version": "9.0.0",
"hash": "sha256-tw4vE5JRQ60ubTZBbxoMPhtjOQCC3XoDFUH7NHO7o8U="
"version": "9.0.1",
"hash": "sha256-FQihbXN3FkEiPprS5XLDIbYLye3RI0yHba099oDuIxY="
},
{
"pname": "System.Composition.Hosting",
"version": "9.0.0",
"hash": "sha256-oOxU+DPEEfMCuNLgW6wSkZp0JY5gYt44FJNnWt+967s="
"version": "9.0.1",
"hash": "sha256-jas95z5TZo4VtLIev6Ixqfh0Xv54CI7zCzJ8867bpVE="
},
{
"pname": "System.Composition.Runtime",
"version": "9.0.0",
"hash": "sha256-AyIe+di1TqwUBbSJ/sJ8Q8tzsnTN+VBdJw4K8xZz43s="
"version": "9.0.1",
"hash": "sha256-wAciMAsH7WR8ETiulgFhBRLBihdNEXb8Zjtzook2UQ4="
},
{
"pname": "System.Composition.TypedParts",
"version": "9.0.0",
"hash": "sha256-F5fpTUs3Rr7yP/NyIzr+Xn5NdTXXp8rrjBnF9UBBUog="
"version": "9.0.1",
"hash": "sha256-fyLCfmGKgUSIpizl6OiSX61Td9xmLjii/PDQAowCihc="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
@@ -701,8 +711,8 @@
},
{
"pname": "System.IO.Hashing",
"version": "8.0.0",
"hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
"version": "9.0.1",
"hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs="
},
{
"pname": "System.Linq.Async",
@@ -726,8 +736,8 @@
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "9.0.0",
"hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ="
"version": "9.0.1",
"hash": "sha256-U2c8q6vD+O42zNTGRSAbsdj+r3+nXegoDYdB/Qm4nvU="
},
{
"pname": "System.Security.Principal.Windows",
@@ -7,7 +7,7 @@
buildNpmPackage rec {
pname = "asf-ui";
version = "6be24065cd4904389d94140f4ed1f6738b1f7fbb";
version = "fbdc518fa1e82c16b9de0a5e2228898796d3f5a2";
src = fetchFromGitHub {
owner = "JustArchiNET";
@@ -15,10 +15,10 @@ buildNpmPackage rec {
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = version;
hash = "sha256-DFl+DCNj4JFKZG1awX5rlsHzj+67OFyBj9d16zDiKRA=";
hash = "sha256-n9V5xUHIByspVSkpcwkohgcPlk22UfA2FBZq7CG1LmE=";
};
npmDepsHash = "sha256-jZSiWZDckfGfgrBMHTX/sm7Pcl5ap3lfmwGi8SHXqu8=";
npmDepsHash = "sha256-lJZgHVO770aYwnudUj2wkUqrSV6rbSDJ9zwtCe+36k8=";
installPhase = ''
runHook preInstall
+2 -2
View File
@@ -18,14 +18,14 @@
stdenv.mkDerivation rec {
pname = "qcad";
version = "3.31.2.7";
version = "3.32.1.0";
src = fetchFromGitHub {
name = "qcad-${version}-src";
owner = "qcad";
repo = "qcad";
rev = "v${version}";
hash = "sha256-gNUmcpyDctmsqavOOaPzyghmfMp6QnZcToUtFoVgoxI=";
hash = "sha256-3P6iudD/swpNDPL4G8isJI6zxqc6/rmHAMpPnEwnuiM=";
};
patches = [
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "helmfile";
version = "0.170.1";
version = "0.171.0";
src = fetchFromGitHub {
owner = "helmfile";
repo = "helmfile";
rev = "v${version}";
hash = "sha256-qu/0l+4fZUk7H5sCZopmCNxja5hI5WwfXga90Yeuy7o=";
hash = "sha256-zZt0YxGbDqIhg2tXjQo5QnD09ASOUgFyQ1uWbGcujkc=";
};
vendorHash = "sha256-vAv/VlAvkPRWrOHDNkt4VdXXjqi65RVjYtvqSJjb8ds=";
vendorHash = "sha256-sGqnM40Y1nr9dXcSSC1lkwh1ToRLpCMiWJhyMcxxH9U=";
proxyVendor = true; # darwin/linux hash mismatch
@@ -46,14 +46,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "telegram-desktop-unwrapped";
version = "5.10.7";
version = "5.11.1";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-lcU2EJQgT7vQa2z0SB8LKhWjhn22Wc+eHi92junY2PY=";
hash = "sha256-lhZ/RSHRr+yaOAec5GOM2mrU0dNQbUxd4g7w+oAF+ZY=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -8,13 +8,13 @@
let
pname = "mendeley";
version = "2.129.0";
version = "2.130.0";
executableName = "${pname}-reference-manager";
src = fetchurl {
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
hash = "sha256-lA3ald0pgNd6az7nP5MPMrs12EEvJaHpEypXFfCvKCQ=";
hash = "sha256-ldlMWitLe3pcA1ip+/NZuswKvPdpn9l8tVSCOOr4pbc=";
};
appimageContents = appimageTools.extractType2 {
@@ -7,13 +7,13 @@
buildLua {
pname = "autosubsync-mpv";
version = "0-unstable-2022-12-26";
version = "0-unstable-2024-10-29";
src = fetchFromGitHub {
owner = "joaquintorres";
repo = "autosubsync-mpv";
rev = "22cb928ecd94cc8cadaf8c354438123c43e0c70d";
sha256 = "sha256-XQPFC7l9MTZAW5FfULRQJfu/7FuGj9bbjQUZhNv0rlc=";
rev = "125ac13d1b84b3a64bb2e912225a8356c1c01364";
sha256 = "sha256-Xwu8WTB3p3YDTydfyidF/zpN6CyTQyZgQvGX/HAa9hw=";
};
# While nixpkgs only packages alass, we might as well make that the default
@@ -8,16 +8,15 @@
pipewire,
pkg-config,
}:
stdenv.mkDerivation rec {
pname = "obs-pipewire-audio-capture";
version = "1.1.5";
version = "1.2.0";
src = fetchFromGitHub {
owner = "dimtpap";
repo = pname;
rev = version;
sha256 = "sha256-qYHU0m+jz/mQmjleITnzxNkTio5ir8dFkHKfmY4l0Es=";
sha256 = "sha256-nkd/AoMsEUUxQQH5CjbnPbNwAwkd1y6j2nCa1GIAFPs=";
};
nativeBuildInputs = [
@@ -31,13 +30,17 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=/lib"
"-DCMAKE_INSTALL_LIBDIR=./lib"
"-DCMAKE_INSTALL_DATADIR=./usr"
];
meta = with lib; {
description = "Audio device and application capture for OBS Studio using PipeWire";
homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture";
maintainers = with maintainers; [ Elinvention ];
maintainers = with maintainers; [
Elinvention
fazzi
];
license = licenses.gpl2Plus;
platforms = [
"x86_64-linux"
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "amazon-ecr-credential-helper";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = "amazon-ecr-credential-helper";
rev = "v${version}";
sha256 = "sha256-TRYBZiddnN6wCErSLKCr9JEH/Ldxg+Oh2hA63+EwRjo=";
sha256 = "sha256-kX1I8HsOJKFogqpfTgFBedM6BObdkpYfYwx3tS2IdMo=";
};
vendorHash = null;
+36
View File
@@ -0,0 +1,36 @@
{
lib,
buildGoModule,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule rec {
pname = "apprun-cli";
version = "0.0.2";
src = fetchFromGitHub {
owner = "fujiwara";
repo = "apprun-cli";
tag = "v${version}";
hash = "sha256-SvFShjAHjIKhz/YolgmFeaAxflh3FRPEZDx57+AtXeQ=";
};
vendorHash = "sha256-pz97Eihc/6b2J+JuEZJQoqBkKtf1J5XbSFMQa1CJrRo=";
ldflags = [
"-s"
"-w"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "CLI for sakura AppRun";
homepage = "https://github.com/fujiwara/apprun-cli";
changelog = "https://github.com/fujiwara/apprun-cli/blob/v${version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
mainProgram = "apprun-cli";
};
}
+3 -3
View File
@@ -34,16 +34,16 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.6.2";
version = "3.6.3";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
tag = "v${version}";
hash = "sha256-GRs6xF9/vZi5LdkDA4RkBR6ElvWi0uji/05h0Y7P2eU=";
hash = "sha256-FbhF/oPWtcDqukeQf+NjfSCieQmrSTKBn3vbRr9IQIE=";
};
vendorHash = "sha256-8+0iBtXNHyLwE6+AeDDQRERt0930kPIjhQ5abqEqey0=";
vendorHash = "sha256-uCIdZkoPgppJtrFf7nOVIyEXo1bVILYXNs5LtLLLmsY=";
doCheck = false;
+2 -2
View File
@@ -47,13 +47,13 @@ in
stdenv.mkDerivation rec {
pname = "astc-encoder";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "ARM-software";
repo = "astc-encoder";
rev = version;
sha256 = "sha256-IGzH/0JLDUkwABCFRVVEJevWwcT5El3HweU6nsVQCJw=";
sha256 = "sha256-rCyi5Nla2IXsLD+rLMTN1h3B9umlNN0epZmPi/IFHPQ=";
};
nativeBuildInputs = [ cmake ];
+9 -3
View File
@@ -1,19 +1,21 @@
{
lib,
badkeys,
fetchFromGitHub,
python3Packages,
testers,
}:
python3Packages.buildPythonApplication rec {
pname = "badkeys";
version = "0.0.12";
version = "0.0.13";
pyproject = true;
src = fetchFromGitHub {
owner = "badkeys";
repo = "badkeys";
tag = "v${version}";
hash = "sha256-LFoB/ZHIMRpN/eHg3x8HCxNbMKclf2SJSDPk33OIil8=";
hash = "sha256-xukdaqyQKEnwPmAN4WZqeLo5g2tJxPehabTyDgCv8q4=";
};
build-system = with python3Packages; [
@@ -35,10 +37,14 @@ python3Packages.buildPythonApplication rec {
pythonImportsCheck = [ "badkeys" ];
passthru = {
tests.version = testers.testVersion { package = badkeys; };
};
meta = {
description = "Tool to find common vulnerabilities in cryptographic public keys";
homepage = "https://badkeys.info/";
changelog = "https://github.com/badkeys/badkeys/releases/tag/v${version}";
changelog = "https://github.com/badkeys/badkeys/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
mainProgram = "badkeys";
+14 -7
View File
@@ -2,15 +2,16 @@
lib,
stdenv,
fetchFromGitHub,
unstableGitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "bakelite";
version = "unstable-2023-03-30";
version = "0.4.2-unstable-2023-05-30";
src = fetchFromGitHub {
owner = "richfelker";
repo = pname;
repo = "bakelite";
rev = "65d69e88e0972d1493ebbd9bf9d1bfde36272636";
hash = "sha256-OjBw9aYD2h7BWYgQzZp03hGCyQcRgmm2AjrcT/QrQAo=";
};
@@ -27,13 +28,19 @@ stdenv.mkDerivation rec {
cp bakelite $out/bin
'';
meta = with lib; {
passthru = {
updateScript = unstableGitUpdater {
tagPrefix = "v";
};
};
meta = {
homepage = "https://github.com/richfelker/bakelite";
description = "Incremental backup with strong cryptographic confidentality";
mainProgram = "bakelite";
license = licenses.gpl2Only;
maintainers = with maintainers; [ mvs ];
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ mvs ];
# no support for Darwin (yet: https://github.com/richfelker/bakelite/pull/5)
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
}
+9 -7
View File
@@ -4,19 +4,18 @@
fetchurl,
jre,
makeWrapper,
testers,
bfg-repo-cleaner,
versionCheckHook,
}:
stdenv.mkDerivation rec {
pname = "bfg-repo-cleaner";
version = "1.14.0";
version = "1.15.0";
jarName = "bfg-${version}.jar";
src = fetchurl {
url = "mirror://maven/com/madgag/bfg/${version}/${jarName}";
hash = "sha256-GnXpOQVB9LVdnAElazYbgVweCiY+L7PQcrVcKRHq0Lc=";
hash = "sha256-3+KIWtwpFjeQk/AqgBgSAFNoVsmph78hxJLkUq3v73o=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -31,9 +30,12 @@ stdenv.mkDerivation rec {
makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main"
'';
passthru.tests.version = testers.testVersion {
package = bfg-repo-cleaner;
};
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "--version" ];
meta = with lib; {
homepage = "https://rtyley.github.io/bfg-repo-cleaner/";
+2 -2
View File
@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "blst";
version = "0.3.13";
version = "0.3.14";
src = fetchFromGitHub {
owner = "supranational";
repo = "blst";
rev = "v${finalAttrs.version}";
hash = "sha256-+Ae2cCVVEXnV/ftVOApxDcXM3COf/4DXXd1AOuGS5uc=";
hash = "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY=";
};
buildPhase = ''
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "bosh-cli";
version = "7.8.6";
version = "7.9.2";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rrYB8W1Zq9rCRgVyAPFZ5i37uEKXvV83hpkLaB7N9zQ=";
sha256 = "sha256-+t1gJJMp2x+V5Wrbt/HnygFa1LlDQWB1NPTKi399HhA=";
};
vendorHash = null;
@@ -0,0 +1,42 @@
diff --git a/Makefile b/Makefile
index 359585f..13ec279 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,6 @@ OBJS= src/fastmap.o src/bwtindex.o src/utils.o src/memcpy_bwamem.o src/kthread.
src/FMI_search.o src/read_index_ele.o src/bwamem_pair.o src/kswv.o src/bwa.o \
src/bwamem_extra.o src/kopen.o
BWA_LIB= libbwa.a
-SAFE_STR_LIB= ext/safestringlib/libsafestring.a
ifeq ($(arch),sse41)
ifeq ($(CXX), icpc)
@@ -101,16 +100,6 @@ CXXFLAGS+= -g -O3 -fpermissive $(ARCH_FLAGS) #-Wall ##-xSSE2
all:$(EXE)
multi:
- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean;
- $(MAKE) arch=sse41 EXE=bwa-mem2.sse41 CXX=$(CXX) all
- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean;
- $(MAKE) arch=sse42 EXE=bwa-mem2.sse42 CXX=$(CXX) all
- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean;
- $(MAKE) arch=avx EXE=bwa-mem2.avx CXX=$(CXX) all
- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean;
- $(MAKE) arch=avx2 EXE=bwa-mem2.avx2 CXX=$(CXX) all
- rm -f src/*.o $(BWA_LIB); cd ext/safestringlib/ && $(MAKE) clean;
- $(MAKE) arch=avx512 EXE=bwa-mem2.avx512bw CXX=$(CXX) all
$(CXX) -Wall -O3 src/runsimd.cpp -Iext/safestringlib/include -Lext/safestringlib/ -lsafestring $(STATIC_GCC) -o bwa-mem2
@@ -120,12 +109,8 @@ $(EXE):$(BWA_LIB) $(SAFE_STR_LIB) src/main.o
$(BWA_LIB):$(OBJS)
ar rcs $(BWA_LIB) $(OBJS)
-$(SAFE_STR_LIB):
- cd ext/safestringlib/ && $(MAKE) clean && $(MAKE) CC=$(CC) directories libsafestring.a
-
clean:
rm -fr src/*.o $(BWA_LIB) $(EXE) bwa-mem2.sse41 bwa-mem2.sse42 bwa-mem2.avx bwa-mem2.avx2 bwa-mem2.avx512bw
- cd ext/safestringlib/ && $(MAKE) clean
depend:
(LC_ALL=C; export LC_ALL; makedepend -Y -- $(CXXFLAGS) $(CPPFLAGS) -I. -- src/*.cpp)
+38 -16
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
safestringlib,
zlib,
}:
@@ -13,21 +14,11 @@ stdenv.mkDerivation (finalAttrs: {
owner = "bwa-mem2";
repo = "bwa-mem2";
rev = "cf4306a47dac35e7e79a9e75398a35f33900cfd0";
fetchSubmodules = true;
hash = "sha256-1AYSn7nBrDwbX7oSrdEoa1d3t6xzwKnA0S87Y/XeXJg=";
hash = "sha256-hY8nLRFWt0GAElhDIcYdUX6cJrzOE3NlYRQr0tC3on4=";
};
buildInputs = [ zlib ];
# see https://github.com/bwa-mem2/bwa-mem2/issues/93
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
sed -i 's/memset_s/memset8_s/g' ext/safestringlib/include/safe_mem_lib.h
sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset16_s.c
sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset32_s.c
sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset_s.c
sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/wmemset_s.c
'';
buildFlags = [
(
if stdenv.hostPlatform.sse4_2Support then
@@ -43,14 +34,45 @@ stdenv.mkDerivation (finalAttrs: {
)
];
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_CFLAGS_COMPILE = toString [
patches = [
./no-submodule.patch
];
# Also, patch the tests
postPatch =
# Force path to static link, otherwise, it fails at runtime to
# find the shared library
''
substituteInPlace Makefile \
--replace-fail "-Iext/safestringlib/include" "-I${safestringlib}/include" \
--replace-fail "-Lext/safestringlib" "-L${safestringlib}/lib"
''
# Make test compile by changing the compiler and path to library
# Remove xeonbsw test that fails to compile due to missing _rdsc
# also, not portable
+ ''
substituteInPlace test/Makefile \
--replace-fail "icpc" "g++" \
--replace-fail "../ext/safestringlib/libsafestring.a" \
"${safestringlib}/lib/libsafestring.a" \
--replace-fail \
"fmi_test smem2_test bwt_seed_strategy_test sa2ref_test xeonbsw" \
"fmi_test smem2_test bwt_seed_strategy_test sa2ref_test"
'';
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.hostPlatform.isDarwin [
"-Wno-error=register"
"-Wno-error=implicit-function-declaration"
];
};
]
);
nativeBuildInputs = [
safestringlib
];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
@@ -67,6 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/bwa-mem2/bwa-mem2/";
changelog = "https://github.com/bwa-mem2/bwa-mem2/blob/${finalAttrs.src.rev}/NEWS.md";
platforms = platforms.x86_64;
maintainers = with maintainers; [ alxsimon ];
maintainers = with maintainers; [ apraga ];
};
})
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "cairo";
version = "2.9.2";
version = "2.9.3";
src = fetchFromGitHub {
owner = "starkware-libs";
repo = "cairo";
rev = "v${version}";
hash = "sha256-zjgCOrTlIPN4aU0+FCohJmISPiwpppj3zO/7unVi/iU=";
hash = "sha256-X6aEyo3VY0C+1w1S7ZuxVKACKDHWaxPMR98ICq6/icg=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-d9S8d0KLxoipH5nE0jyUaFAl/V8eSOvOwf2skrW5K5g=";
cargoHash = "sha256-yjo7nxt/oAqPRI6I3WlnFC+lfT5HiQJnsjTuijx4ekk=";
# openssl crate requires perl during build process
nativeBuildInputs = [
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-shuttle";
version = "0.51.0";
version = "0.52.0";
src = fetchFromGitHub {
owner = "shuttle-hq";
repo = "shuttle";
rev = "v${version}";
hash = "sha256-oKFL/tnMsXz/qic65DgLmnmeyBsrklacs+XeVM6RGSs=";
hash = "sha256-uAxNLoB8ExfHpGRl96OZWhzV8hSiDzt1E7T4OD21w74=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-ocTkpIqXTf8k+onUroaCt/jMnslctzCt7g9wNtkI82g=";
cargoHash = "sha256-cHwF4+5HQmT2hICJjCF1zaivq6AtFhhLatxUWv+esCo=";
nativeBuildInputs = [ pkg-config ];
@@ -0,0 +1,13 @@
diff --git a/src/imgui/imgui_extension.cpp b/src/imgui/imgui_extension.cpp
index f1c072f..e3e901d 100644
--- a/src/imgui/imgui_extension.cpp
+++ b/src/imgui/imgui_extension.cpp
@@ -129,8 +129,6 @@ void ImGui_UpdateWindowInformation(bool mainWindow)
io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
#if BOOST_OS_WINDOWS
io.ImeWindowHandle = mainWindow ? g_window_info.window_main.hwnd : g_window_info.window_pad.hwnd;
-#else
- io.ImeWindowHandle = nullptr;
#endif
io.MousePos = ImVec2(-FLT_MAX, -FLT_MAX);
+8 -5
View File
@@ -34,24 +34,25 @@
wrapGAppsHook3,
wxGTK32,
zarchive,
bluez,
}:
let
# cemu doesn't build with imgui 1.90.2 or newer:
# error: 'struct ImGuiIO' has no member named 'ImeWindowHandle'
# cemu doesn't build with imgui 1.91.4 or newer:
# before v1.91.4 (2024/10/08) the default type for ImTextureID was void*.
imgui' = imgui.overrideAttrs rec {
version = "1.90.1";
version = "1.91.3";
src = fetchFromGitHub {
owner = "ocornut";
repo = "imgui";
rev = "v${version}";
hash = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg=";
hash = "sha256-J4gz4rnydu8JlzqNC/OIoVoRcgeFd6B1Qboxu5drOKY=";
};
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "cemu";
version = "2.4";
version = "2.5";
src = fetchFromGitHub {
owner = "cemu-project";
@@ -71,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/cemu-project/Cemu/commit/2b0cbf7f6b6c34c748585d255ee7756ff592a502.patch";
hash = "sha256-jHB/9MWZ/oNfUgZtxtgkSN/OnRARSuGVfXFFB9ldDpI=";
})
./0002-cemu-imgui.patch
];
nativeBuildInputs = [
@@ -106,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland
wxGTK32
zarchive
bluez
];
cmakeFlags = [
+19 -10
View File
@@ -7,7 +7,7 @@
let
pname = "certificate-ripper";
version = "2.3.0";
version = "2.4.0";
jar = maven.buildMavenPackage {
pname = "${pname}-jar";
@@ -16,8 +16,8 @@ let
src = fetchFromGitHub {
owner = "Hakky54";
repo = "certificate-ripper";
rev = version;
hash = "sha256-q/UhKLFAre3YUH2W7e+SH4kRM0GIZAUyNJFDm02eL+8=";
tag = version;
hash = "sha256-2EXALTGeGkHne335B1R42VrA5vMCMkFF5FBatAfO9Tc=";
};
patches = [
@@ -25,12 +25,22 @@ let
./fix-test-temp-dir-path.patch
];
mvnHash = "sha256-/iy7DXBAyq8TIpvrd2WAQh+9OApfxCWo1NoGwbzbq7s=";
mvnHash = "sha256-Nv/V2+QPSPMxkDcUh6gJrI6aSi+9O+brxpOZg/JPGxI=";
mvnParameters = lib.escapeShellArgs [
"-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic
"-Dtest=!PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # disable test using network
];
mvnParameters =
let
disabledTests = [
"PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # uses network
"DerExportCommandShould#processSystemTrustedCertificates"
"JksExportCommandShould#processSystemTrustedCertificates"
"PemExportCommandShould#processSystemTrustedCertificates"
"Pkcs12ExportCommandShould#processSystemTrustedCertificates"
];
in
lib.escapeShellArgs [
"-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic
"-Dtest=${lib.concatMapStringsSep "," (t: "!" + t) disabledTests}"
];
installPhase = ''
install -Dm644 target/crip.jar $out
@@ -47,13 +57,12 @@ buildGraalvmNativeImage {
# Copied from pom.xml
extraNativeImageBuildArgs = [
"--no-fallback"
"-H:ReflectionConfigurationResources=graalvm_config.json"
"-H:EnableURLProtocols=https"
"-H:EnableURLProtocols=http"
];
meta = {
changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${version}";
changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${jar.src.tag}";
description = "CLI tool to extract server certificates";
homepage = "https://github.com/Hakky54/certificate-ripper";
license = lib.licenses.asl20;
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cglm";
version = "0.9.4";
version = "0.9.5";
src = fetchFromGitHub {
owner = "recp";
repo = "cglm";
rev = "v${version}";
sha256 = "sha256-VQgnc3DSZoY1ounc9fj3Mju52noI0JZ7ck8FqWpEgY8=";
sha256 = "sha256-yc8UFKl0q+QZ9helTzrxfZdk7yeRSb3bUVyIL+uRWdQ=";
};
nativeBuildInputs = [ cmake ];
+2 -2
View File
@@ -10,7 +10,7 @@ in
buildGoModule rec {
pname = "chroma";
version = "2.8.0";
version = "2.15.0";
# To update:
# nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
@@ -21,7 +21,7 @@ buildGoModule rec {
inherit (srcInfo) sha256;
};
vendorHash = "sha256-Bol5yMvNYuoVnSjEgf3h6X4CeUooy2Hpdy3SCaNXXOE=";
vendorHash = "sha256:14jg809xz647yv6sc8rnnksg2bpnn75panj8a2kdk2v87yrpq2zr";
modRoot = "./cmd/chroma";
+5 -4
View File
@@ -1,9 +1,10 @@
{
"url": "https://github.com/alecthomas/chroma.git",
"rev": "e8acfc274c22a76fd38030d2977a2246cd4322b3",
"date": "2023-06-30T08:43:39+10:00",
"path": "/nix/store/57y15g11dmdy2s6vxrjzl03s03j509gy-chroma",
"sha256": "0fdgpi5r0k42qzdn4lxh81ww1zcn9mwfildwrqf1s7crsqmr9dc5",
"rev": "009385f9487ee14c8a54e49aaf4331fea0830310",
"date": "2024-12-30T09:27:18+11:00",
"path": "/nix/store/rr2cj4bmlfw803diwyfpbrpai35gifaw-chroma",
"sha256": "088w3aixwfk8s04iyb2mjn3kx5dl3gb9q14jzawabcdy2ar7iijn",
"hash": "sha256-VsZ4shK+saW4+pIEnNYbtJU+h5VVLB8J0Gg63qMaHCE=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
+3 -3
View File
@@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "cntb";
version = "1.4.12";
version = "1.5.2";
src = fetchFromGitHub {
owner = "contabo";
repo = "cntb";
rev = "v${version}";
hash = "sha256-5JOO9tWMjy81wSB9Vq/gBYZ0xfrhES0dm/cTqXP8HiI";
hash = "sha256-ym4SYeAkxKBq/0VgyXx1uoHiM29LEXMqHl3XICdM30Y=";
# docs contains two files with the same name but different cases,
# this leads to a different hash on case insensitive filesystems (e.g. darwin)
# https://github.com/contabo/cntb/issues/34
@@ -22,7 +22,7 @@ buildGoModule rec {
subPackages = [ "." ];
vendorHash = "sha256-IBDVHQe6OOGQ27G7uXKRtavy4tnCvIbL07j969/E9Vg=";
vendorHash = "sha256-6J93Nt9MhnTjsah8sDff0SvImzOEsSdnDHBhUADmO1k=";
ldflags = [
"-X contabo.com/cli/cntb/cmd.version=${src.rev}"
+37 -2
View File
@@ -244,6 +244,16 @@
"version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
},
{
"pname": "Microsoft.NETFramework.ReferenceAssemblies",
"version": "1.0.3",
"hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="
},
{
"pname": "Microsoft.NETFramework.ReferenceAssemblies.net452",
"version": "1.0.3",
"hash": "sha256-RTPuFG8D7gnwINEoEtAqmVm4oTW8K4Z87v1o4DDeLMI="
},
{
"pname": "Microsoft.TestPlatform.Extensions.TrxLogger",
"version": "17.9.0",
@@ -294,6 +304,11 @@
"version": "2.6.81",
"hash": "sha256-0Zshmi1IMWj9/MKUieffpgJxKhJyVgBXPKMg9RSDkRs="
},
{
"pname": "NETStandard.Library",
"version": "2.0.3",
"hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
},
{
"pname": "Newtonsoft.Json",
"version": "11.0.2",
@@ -529,6 +544,11 @@
"version": "4.3.0",
"hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
},
{
"pname": "System.Buffers",
"version": "4.4.0",
"hash": "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA="
},
{
"pname": "System.Collections",
"version": "4.3.0",
@@ -624,11 +644,21 @@
"version": "4.1.0",
"hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="
},
{
"pname": "System.Memory",
"version": "4.5.3",
"hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
},
{
"pname": "System.Net.WebSockets",
"version": "4.3.0",
"hash": "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.4.0",
"hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
},
{
"pname": "System.ObjectModel",
"version": "4.0.12",
@@ -724,6 +754,11 @@
"version": "4.4.0",
"hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.2",
"hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.7.1",
@@ -841,7 +876,7 @@
},
{
"pname": "Tomlyn",
"version": "0.16.2",
"hash": "sha256-ULW4n8s2lvTMG3I18rpsVfXtKXN7C8nPrMXQowxGIsU="
"version": "0.17.0",
"hash": "sha256-pJHF7w8RJhV23wiI3qzm5el4qPlPlgYTmTKA8yGhzXY="
}
]
+3 -10
View File
@@ -38,18 +38,18 @@ let
in
buildDotnetModule rec {
pname = "Dafny";
version = "4.9.1";
version = "4.10.0";
src = fetchFromGitHub {
owner = "dafny-lang";
repo = "dafny";
tag = "v${version}";
hash = "sha256-fCBaOF1mDrqJaUiATZAhzLjlK3NGVFnxdOwgHbOkkgY=";
hash = "sha256-aPOjt4bwalhJUTJm4+pGqN88LwDP5zrVtakF26b3K4s=";
};
postPatch =
let
runtimeJarVersion = "4.9.1";
runtimeJarVersion = "4.10.0";
in
''
cp ${writeScript "fake-gradlew-for-dafny" ''
@@ -66,13 +66,6 @@ buildDotnetModule rec {
substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \
--replace-fail TargetFrameworks TargetFramework \
--replace-fail "netstandard2.0;net452" net8.0
for f in Source/**/*.csproj ; do
[[ "$f" == "Source/DafnyRuntime/DafnyRuntime.csproj" ]] && continue;
substituteInPlace $f \
--replace-fail net6.0 net8.0
done
'';
dotnet-sdk = dotnetCorePackages.sdk_8_0;
+3 -3
View File
@@ -18,17 +18,17 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "2.1.9";
version = "2.1.10";
src = fetchFromGitHub {
owner = "denoland";
repo = "deno";
tag = "v${version}";
hash = "sha256-a3oMEZIs9RkD0T4saeaCuQh0VrdNXciKwPJaHO7/Y3I=";
hash = "sha256-1NqBNrTYHhsG6O2qsgANM15FOxx3xheE9T3nYDDH1D0=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-UqjkO3k77nUGnV8V4TDC3BbA+jR6/h2wGkgSLus0yVA=";
cargoHash = "sha256-D7dt9RdlTmR2C1dwOl5vZKUlLUnTkdudtZ4FQpr9ddU=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
# the wrapped version of Descent 3. Once theres a stable version of Descent
# 3 that supports the -additionaldir command-line option, we can stop using
# an unstable version of Descent 3.
version = "1.5.0-beta-unstable-2025-01-01";
version = "1.5.0-beta-unstable-2025-02-13";
src = fetchFromGitHub {
owner = "DescentDevelopers";
repo = "Descent3";
rev = "11f93221e71201d51a71650a3b190017328cd721";
rev = "10a20d7cb769a08010e7887b4701a0ecfb142492";
fetchSubmodules = true;
leaveDotGit = true;
# Descent 3 is supposed to display its Git commit hash in the bottom right
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt
rm -r .git
'';
hash = "sha256-L+Y8Eum9SjGpbbLnBH25uUI4UgCGDwrgE5op19GOAtQ=";
hash = "sha256-Ufu6oHLUn0eI6OTp8cfHRLYpx+tZ3QwX4qz3KpTbQ68=";
};
hardeningDisable = [ "format" ];
@@ -0,0 +1,11 @@
--- a/src/build/bundle.rs
+++ b/src/build/bundle.rs
@@ -334,7 +334,7 @@ impl AppBundle {
// Only run wasm-opt if the feature is enabled
// Wasm-opt has an expensive build script that makes it annoying to keep enabled for iterative dev
// We put it behind the "wasm-opt" feature flag so that it can be disabled when iterating on the cli
- self.run_wasm_opt(&self.build.exe_dir())?;
+ self.run_wasm_opt(&self.build.wasm_bindgen_out_dir())?;
// Write the index.html file with the pre-configured contents we got from pre-rendering
std::fs::write(
+19 -4
View File
@@ -14,16 +14,24 @@
rustPlatform.buildRustPackage rec {
pname = "dioxus-cli";
version = "0.6.0";
version = "0.6.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-0Kg2/+S8EuMYZQaK4Ao+mbS7K48VhVWjPL+LnoVJMSw=";
hash = "sha256-jUS/it2N5o5D7Jon0fKHWEt3f0wdtVgNIkqSNc7u830=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-uD3AHHY3edpqyQ8gnsTtxQsen8UzyVIbArSvpMa+B+8=";
buildFeatures = [ "optimizations" ];
cargoHash = "sha256-izvo092FGZmci1cXLo+qhGlBh8W3A1TeBHrYXcjE6HU=";
cargoPatches = [
# TODO: Remove once https://github.com/DioxusLabs/dioxus/issues/3659 is fixed upstream.
./fix-wasm-opt-target-dir.patch
];
buildFeatures = [
"no-downloads"
"optimizations"
];
nativeBuildInputs = [
pkg-config
@@ -34,11 +42,18 @@ rustPlatform.buildRustPackage rec {
OPENSSL_NO_VENDOR = 1;
# wasm-opt-sys build.rs tries to verify C++17 support, but the check appears to be faulty.
postPatch = ''
substituteInPlace $cargoDepsCopy/wasm-opt-sys-*/build.rs \
--replace-fail 'check_cxx17_support()?;' '// check_cxx17_support()?;'
'';
nativeCheckInputs = [ rustfmt ];
checkFlags = [
# requires network access
"--skip=serve::proxy::test"
"--skip=wasm_bindgen::test"
];
passthru = {
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dosage";
version = "1.8.0";
version = "1.8.3";
src = fetchFromGitHub {
owner = "diegopvlk";
repo = "Dosage";
tag = "v${finalAttrs.version}";
hash = "sha256-u/HnlnitLJjYxt+LqbhS2DYUDVVBamZCakBym2eNK1c=";
hash = "sha256-BEKhIIM0/uaqFD56W+fgsE78KVgqj6HqpS7KRp9Lt3c=";
};
# https://github.com/NixOS/nixpkgs/issues/318830
+2 -2
View File
@@ -2,9 +2,9 @@
buildDotnetGlobalTool {
pname = "dotnet-ef";
version = "9.0.1";
version = "9.0.2";
nugetHash = "sha256-b1dxnBDnsn4kWvcy95eQj3qrL4ucAqw/pXvU3aFpPk8=";
nugetHash = "sha256-aevR1w8IDXrRLnrR5ax2BaAjGpjOWuBKJ9TzI43p7mc=";
meta = {
description = "The Entity Framework Core tools help with design-time development tasks.";
-1415
View File
File diff suppressed because it is too large Load Diff
+11 -12
View File
@@ -4,31 +4,30 @@
fetchFromGitHub,
}:
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "egglog";
version = "0-unstable-2024-01-26";
version = "0.4.0";
src = fetchFromGitHub {
owner = "egraphs-good";
repo = "egglog";
rev = "b78f69ca1f7187c363bb31271c8e8958f477f15d";
hash = "sha256-/1ktyz8wU1yLTdAFPnupK6jUFjiK6nQfotGRNOWiOsA=";
rev = "v${version}";
hash = "sha256-j+3qknmezKqHVxvfmG9oPFtWOzJsimGXYe5PWX694mI=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-gWccsWZCOucNP6M6cJqCMF8emwzqLXkaRm/huK4ARTs=";
useNextest = true;
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"generic_symbolic_expressions-5.0.3" = "sha256-UX6fS470YJMdNnn0GR3earMGQK3p/YvaFia7IEvGGKg=";
};
};
meta = with lib; {
description = "Fixpoint reasoning system that unifies Datalog and equality saturation";
mainProgram = "egglog";
homepage = "https://github.com/egraphs-good/egglog";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
maintainers = with maintainers; [
figsoda
XBagon
];
};
}
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "fq";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "wader";
repo = "fq";
rev = "v${version}";
hash = "sha256-bHyLEJiSM42arZiM1VVKga6wp3Q3EAMgUrFnh3hbk9M=";
hash = "sha256-I3mVAPNWjRHG0td1ulzGOthiNybfWLx1HgwPjFfBHCo=";
};
vendorHash = "sha256-in+c8Wl7ffXAqMvs+3K6dzAd5ePqBpRaxU2iM81moQM=";
vendorHash = "sha256-p2cvv983gYTvyLPYIGVsk6N7yUzBpiPzgJ3sMRNWPTo=";
ldflags = [
"-s"
+3 -3
View File
@@ -30,19 +30,19 @@
stdenv.mkDerivation rec {
pname = "fractal";
version = "10";
version = "10.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "fractal";
tag = version;
hash = "sha256-dXmdoEBvHhOoICIDCpi2JTPo7j/kQzlv+Q/S/7LNyv0=";
hash = "sha256-61xiHVzmLMbLNZlobH6JVcvuO9eoFwqBZBo1rVtPYOc=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
hash = "sha256-qRxJvlorS5S3Wj3HjfvvR2nM/ZWzefz4x791UeSXm0w=";
hash = "sha256-e3IW8D4aLU6d36ErUHDUDiXF1lN4HCn5OCX6GwaT3iQ=";
};
# Dirty approach to add patches after cargoSetupPostUnpackHook
+4 -4
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gale";
version = "1.2.2";
version = "1.3.1";
src = fetchFromGitHub {
owner = "Kesomannen";
repo = "gale";
tag = finalAttrs.version;
hash = "sha256-bpeRbsbC1x1AXSyEPs1pUqwMouHQqJ/OtXXlNOVYcEA=";
hash = "sha256-cIholTqWxDb3CkKCY8qRhevxd7CQxBlBGmhJ/91K1g4=";
};
postPatch = ''
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src;
hash = "sha256-xKg/ABUdtylFpT3EisXVvyv38++KjucrZ+s3/fFjzmM=";
hash = "sha256-qhH8jeRQZgx6DELzxczt6AmoILxZHUkVpVkYZoDQPRQ=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
src
cargoRoot
;
hash = "sha256-OocLkYAdmnAwvojzywNlg6BirkItoopX36aDYfqeeTA=";
hash = "sha256-RtTqdbMZlsLNEoxdwjUd0B/3TkdbDpcjOMhH8BlshfE=";
};
cargoRoot = "src-tauri";
-5
View File
@@ -144,11 +144,6 @@
"version": "8.0.0",
"hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="
},
{
"pname": "NLua",
"version": "1.7.3",
"hash": "sha256-2+eOxal0BDwAc6nJTNsFvf5E0KdfksIie7C7hEKeQos="
},
{
"pname": "System.ClientModel",
"version": "1.0.0",
+2 -2
View File
@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "garnet";
version = "1.0.54";
version = "1.0.55";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
tag = "v${version}";
hash = "sha256-tTJz4LilzrSDDmsTwRRK3Svif3ewUWuU3nbUN8GyyPY=";
hash = "sha256-yeaSSQXsTw6JsF2ugCRSIWCSwuOYuWLErb77/CBraQE=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";
+12 -7
View File
@@ -1,5 +1,4 @@
# generated by zon2nix (https://github.com/Cloudef/zig2nix)
{
lib,
linkFarm,
@@ -9,10 +8,8 @@
zig,
name ? "zig-packages",
}:
with builtins;
with lib;
let
unpackZigArtifact =
{
@@ -207,7 +204,7 @@ linkFarm name [
name = "12209ca054cb1919fa276e328967f10b253f7537c4136eb48f3332b0f7cf661cad38";
path = fetchZigArtifact {
name = "zig_wayland";
url = "https://codeberg.org/ifreund/zig-wayland/archive/fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz";
url = "https://deps.files.ghostty.org/zig-wayland-fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz";
hash = "sha256-RtAystqK/GRYIquTK1KfD7rRSCrfuzAvCD1Z9DE1ldc=";
};
}
@@ -227,6 +224,14 @@ linkFarm name [
hash = "sha256-QWN4jOrA91KlbqmeEHHJ4HTnCC9nmfxt8DHUXJpAzLI=";
};
}
{
name = "12208d70ee791d7ef7e16e1c3c9c1127b57f1ed066a24f87d57fc9f730c5dc394b9d";
path = fetchZigArtifact {
name = "gobject";
url = "https://github.com/ianprime0509/zig-gobject/releases/download/v0.2.2/bindings-gnome47.tar.zst";
hash = "sha256-UU97kNv/bZzQPKz1djhEDLapLguvfBpFfWVb6FthtcI=";
};
}
{
name = "12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f";
path = fetchZigArtifact {
@@ -252,11 +257,11 @@ linkFarm name [
};
}
{
name = "12204fc99743d8232e691ac22e058519bfc6ea92de4a11c6dba59b117531c847cd6a";
name = "12203d2647e5daf36a9c85b969e03f422540786ce9ea624eb4c26d204fe1f46218f3";
path = fetchZigArtifact {
name = "iterm2_themes";
url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/0e23daf59234fc892cba949562d7bf69204594bb.tar.gz";
hash = "sha256-KswGCFqD1TOBkvaqtRcFOm96TbIqhqUEOg1u1ye/f0s=";
url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/db227d159adc265818f2e898da0f70ef8d7b580e.tar.gz";
hash = "sha256-Iyf7U4rpvNkPX4AOEbYSYGte5+SjRwsWD2luOn1Hz8U=";
};
}
{
+2 -4
View File
@@ -28,7 +28,6 @@
# https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/build.zig#L106
withAdwaita ? true,
}:
let
zig_hook = zig_0_13.hook.overrideAttrs {
zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off";
@@ -41,10 +40,9 @@ let
# https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/renderer.zig#L51-L52
renderer = if stdenv.hostPlatform.isDarwin then "metal" else "opengl";
in
stdenv.mkDerivation (finalAttrs: {
pname = "ghostty";
version = "1.1.0";
version = "1.1.2";
outputs = [
"out"
"man"
@@ -57,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ghostty-org";
repo = "ghostty";
tag = "v${finalAttrs.version}";
hash = "sha256-a2A/mt2xS19YEQB+cTPdew/a7xCnGWNvIOdO9QNqxm0=";
hash = "sha256-HZiuxnflLT9HXU7bc0xrk5kJJHQGNTQ2QXMZS7bE2u8=";
};
deps = callPackage ./deps.nix {
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gnu-shepherd";
version = "1.0.1";
version = "1.0.2";
src = fetchurl {
url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz";
hash = "sha256-iV0AUeHMRzsfefY5E3d7TRX4nxbQpyN3QXbaEC4nEMU=";
hash = "sha256-30usBLSwR2+o+e0TgpKsLMVLQwS17v2FntSJLU+ZJL8=";
};
configureFlags = [ "--localstatedir=/" ];
@@ -7,18 +7,18 @@
buildGoModule rec {
pname = "google-alloydb-auth-proxy";
version = "1.12.1";
version = "1.12.2";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "alloydb-auth-proxy";
tag = "v${version}";
hash = "sha256-FnYVkZxdWFxY0aIUbHTSDLJ+AgYE2L03vNya1K2e3SI=";
hash = "sha256-3zJAwkl+fqiiGvrXWzTwFHmAOYOw1NVb/JUok5qZxNs=";
};
subPackages = [ "." ];
vendorHash = "sha256-0VksnkdN7E6VEzzxSIc6AfOvxlPm67vEj+HVR6N+BqA=";
vendorHash = "sha256-cGrJIbo4qEKIc7/XBwZtK5OrqE4t/Cmp54YKJMst8h8=";
checkFlags = [
"-short"
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "google-authenticator-libpam";
version = "1.10";
version = "1.11";
src = fetchFromGitHub {
owner = "google";
repo = "google-authenticator-libpam";
rev = version;
hash = "sha256-KEfwQeJIuRF+S3gPn+maDb8Fu0FRXLs2/Nlbjj2d3AE=";
hash = "sha256-cLMX5SdKvyQr3annc/Hhhz6XgY+BypRHASKRh6xTdmo=";
};
nativeBuildInputs = [ autoreconfHook ];
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "grafana-dash-n-grab";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "esnet";
repo = "gdg";
sha256 = "sha256-oJ0wXBfanpYS95ET+7lpKzLdQG5g/uKFs5+Qd+hPjHo=";
sha256 = "sha256-0F4kdyQ4TXV2vb2IkPx7CisTmJAQjlSRtOAFhmZqaD8=";
};
vendorHash = "sha256-jnPnWcow5SiFHGfoAxBR8ncGHLyS7sFKNJT8YuUTg88=";
vendorHash = "sha256-Ufg4eeSLRHFkI577hPT5KWOf82o7//Y3n5GAlZl8IoQ=";
ldflags = [
"-s"
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "grizzly";
version = "0.6.1";
version = "0.7.1";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
hash = "sha256-9NtJHavlkuu8qSQI4FvXDOKfD1WjNzVqGDd8/8Fo3DE=";
hash = "sha256-1caG2QIBfbCgg9TLsW4XB0w+4dqUkQEsdWwRazbWeQA=";
};
vendorHash = "sha256-lioFmaFzqaxN1wnYJaoHA54to1xGZjaLGaqAFIfTaTs=";
vendorHash = "sha256-JxYafSralKqd/AB6fhTuQvt0q+/Zeu7dmZwVAAkolxY=";
subPackages = [ "cmd/grr" ];
+3 -3
View File
@@ -7,15 +7,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.24.2";
version = "1.24.3";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
hash = "sha256-JJ/zLW6ri53qSTmbGZS2FhY2AJ1h3L/hk0rnj0swml4=";
hash = "sha256-/ABy0zZF/+rxYkpS5H6EAXZVYZxt7I4SCjLtrtkacGw=";
};
vendorHash = "sha256-0sUxqOW3PeMXZvlTmMBvs6vnc3pSLzSISfUSo9YdToQ=";
vendorHash = "sha256-B4MxvOzKxsQJmc9dKQFt1CGi1PnElOt8H72H2JVaZUU=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "juju";
version = "3.6.1";
version = "3.6.2";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "v${version}";
hash = "sha256-eq7C3F/OJWF/HWMO9I+yTlXeskO1xuTKGhmoNNGQcyM=";
hash = "sha256-qARy8c24VLE+Gmsszkvlwkh5Oo+sozoptjMIa4OiBfc=";
};
vendorHash = "sha256-+2MeUq+r0/2I8C/8IVZTxrKIZTS36P/9XHM2X41AZPE=";
vendorHash = "sha256-O7EGhy5bmTeUvlxpX0cv2kmeKDvPzilZxk0mTuyJCP8=";
subPackages = [
"cmd/juju"
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "k6";
version = "0.56.0";
version = "0.57.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
hash = "sha256-QU/FJZqyodwUGxb3MjaQXIGWZSlrkxKe4bh6r/p7jrQ=";
hash = "sha256-wU/Kelv/5N86xHJT6E5dfdzBgSYiTYZJ8rkjLyU7RAo=";
};
subPackages = [ "./" ];
+2 -2
View File
@@ -23,7 +23,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.69.0";
version = "1.70.0";
pyproject = false;
src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos";
repo = "Komikku";
rev = "v${version}";
hash = "sha256-YrqoUU2BYM6AMD5s6FJn8GV+UmyeKV2mFQyfJjLI8HA=";
hash = "sha256-JkuA7He3gVhKZGsZGZkfQad8jUDlG7MaLlfkuhpcd3w=";
};
nativeBuildInputs = [
+59
View File
@@ -0,0 +1,59 @@
{
lib,
stdenv,
fetchgit,
libplist,
libxml2,
openssl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ldid";
version = "2.1.5";
src = fetchgit {
url = "git://git.saurik.com/ldid.git";
rev = "v${finalAttrs.version}";
hash = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM=";
};
strictDeps = true;
buildInputs = [
libplist
libxml2
openssl
];
env.NIX_LDFLAGS = toString ([
"-lcrypto"
"-lplist-2.0"
]);
buildPhase = ''
runHook preBuild
cc -c -o lookup2.o lookup2.c -I.
c++ -std=c++11 -o ldid lookup2.o ldid.cpp -I.
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 {,$out/bin/}ldid
ln -s $out/bin/ldid $out/bin/ldid2
runHook postInstall
'';
meta = {
description = "Link Identity Editor";
homepage = "https://cydia.saurik.com/info/ldid/";
license = lib.licenses.agpl3Only;
mainProgram = "ldid";
maintainers = with lib.maintainers; [ wegank ];
platforms = lib.platforms.unix;
};
})
+3 -3
View File
@@ -15,15 +15,15 @@
rustPlatform.buildRustPackage rec {
pname = "leetcode-cli";
version = "0.4.5";
version = "0.4.6";
src = fetchCrate {
inherit pname version;
hash = "sha256-Jc0akHj2DHbkF7sjslOwdeI1piW2gnhoalBz18lpQdQ=";
hash = "sha256-AYBBW9VtdvqqqiouhkS3diPcOdaQOs8Htkw9DTRX2t4=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-rr/8rbgjGr1npkimJK8rpZcsRFP0ACx+a1x0ITI71G0=";
cargoHash = "sha256-o2RkhYsSQKwU+dsHQvlcxAVKUjOTqg424dqrM7JRoN8=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "libdatachannel";
version = "0.22.4";
version = "0.22.5";
src = fetchFromGitHub {
owner = "paullouisageneau";
repo = "libdatachannel";
rev = "v${version}";
hash = "sha256-mnBB2UyeQ73NckE3uF91RhezJDKMQeoOKn8515ygrU0=";
hash = "sha256-6oJf7yHI47VOZtE2AKan+3GrcAgMMxJaZziNsSe7pdg=";
};
outputs = [
+1 -1
View File
@@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchzip {
url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip";
sha256 = "sha256-L+T9XxTH7+yFJwhZ8UXAlq3rAkPFn/8dRBoGfbiHuGA=";
sha256 = "sha256-W6ewNtFDS1O1fwoAe27tIgNZn7AAKo965dWkZYzsg+o=";
stripRoot = false;
};
+7 -4
View File
@@ -15,7 +15,7 @@
buildGoModule rec {
pname = "mautrix-meta";
version = "0.4.0";
version = "0.4.3";
subPackages = [ "cmd/mautrix-meta" ];
@@ -23,13 +23,13 @@ buildGoModule rec {
owner = "mautrix";
repo = "meta";
rev = "v${version}";
hash = "sha256-KJuLBJy/g4ShcylkqIG4OuUalwboUSErSif3p7x4Zo4=";
hash = "sha256-aq1tmw19evTxmSNpDQyFdjyc0ow1Rsm2jlodglcj084=";
};
buildInputs = lib.optional (!withGoolm) olm;
tags = lib.optional withGoolm "goolm";
vendorHash = "sha256-ErY40xIDhhOHQI/jYa8DcnfjOI998neIMgb/IQNP/JQ=";
vendorHash = "sha256-1ulBTkhb/MDmu26R8v8HUt1HkRNpsufpp+EzTQrlaCQ=";
passthru = {
tests = {
@@ -46,7 +46,10 @@ buildGoModule rec {
homepage = "https://github.com/mautrix/meta";
description = "Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ eyjhb ];
maintainers = with lib.maintainers; [
eyjhb
sumnerevans
];
mainProgram = "mautrix-meta";
};
}
+3 -3
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "melange";
version = "0.18.3";
version = "0.19.3";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-bFlILwA8Vy7u8pJFx8PHvfYaeh8M2SRzrTpdDMYz6+M=";
hash = "sha256-90Ezv9PM1lFRq4b0ACrc34OteF6P/8DhZy+5kCnInSI=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -25,7 +25,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-xOsxzDIk2tuPXDtf1k0604B3AYgxEH5iQ/YdDs2Aezs=";
vendorHash = "sha256-V1BDcAD84W5n/IOAcO+eMd+LnSe0sgNgBeq95dOl/Us=";
subPackages = [ "." ];
+2 -2
View File
@@ -9,7 +9,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "1.5.0";
version = "1.5.1";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-JRuQ5R4EVDP2wVez3FnD4Vx8h200ShiXRhyRtKhs8V4=";
outputHash = "sha256-2FA2B/WzNGU4B785pn5zZ9Xj64huzbSbr2Or+CxUMlI=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "minio-warp";
version = "1.0.8";
version = "1.1.0";
src = fetchFromGitHub {
owner = "minio";
repo = "warp";
rev = "v${version}";
hash = "sha256-kME4yafNZtHDF/EAIG8qR4PH6HlokIfdBAJH+ibl5ro=";
hash = "sha256-8GQ0rSy+bzji1IZu6vHEXjYVVuQSLlSCwWmzjLE9a+A=";
};
vendorHash = "sha256-073ssCOh0CiiJaatwzhNrwpe2QO21iC6GSkwVtsmYjs=";
vendorHash = "sha256-Qyb8ivuZplbOIxoS2cC+2FSZbW7CnChv1jaIKkCzgN4=";
# See .goreleaser.yml
ldflags = [
+9 -9
View File
@@ -1,21 +1,21 @@
{
"version": "3.131.2",
"version": "3.132.1",
"assets": {
"x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_x86_64",
"hash": "sha256-S5esVEqssMZJdxlR8MMVgMbsZkgewD69cNT/lI1LerE="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_linux_x86_64",
"hash": "sha256-O3AoKIK1DZ4We0Bqs60Jzyr/qVhC0SglMfErtkvNvtA="
},
"aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_aarch64",
"hash": "sha256-2SC/6Q43AhUjx2i3kwCLHIMEnxp23qbUuFXYKZBLin8="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_linux_aarch64",
"hash": "sha256-e+5Bd5PgAxqG5bOImA6f7L6mn42nb8AenV0MBI9HPLA="
},
"aarch64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal",
"hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_mac_universal",
"hash": "sha256-4R44hKYcJc7/Q6TJRrYtwBKtrda/ykID7mbVV1FCv/k="
},
"x86_64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal",
"hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.132.1/mirrord_mac_universal",
"hash": "sha256-4R44hKYcJc7/Q6TJRrYtwBKtrda/ykID7mbVV1FCv/k="
}
}
}
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "mtr-exporter";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "mgumz";
repo = "mtr-exporter";
rev = version;
hash = "sha256-dMlMUjbUg05Z8FFEPwMOiHzLiHSSjV1CzKqrt/qJ6Js=";
hash = "sha256-+MomCtDMhnN9HsWguvzCKKaBl5CO0vL27OBjQfuajLI=";
};
vendorHash = null;
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "muffet";
version = "2.10.7";
version = "2.10.8";
src = fetchFromGitHub {
owner = "raviqqe";
repo = "muffet";
rev = "v${version}";
hash = "sha256-txIH3FqKQ6IWN19aABmLAJicmXi6NK7VpH6NDMtAGUE=";
hash = "sha256-vpckg0zx8RNR7dAKjdlSHyevn7kDslrysah8jCLSaBw=";
};
vendorHash = "sha256-IbpTQdJ6OssyzwS2H4iNgJybC9rvvlW6UYkihNkBYOE=";
+2 -2
View File
@@ -28,11 +28,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netatalk";
version = "4.1.1";
version = "4.1.2";
src = fetchurl {
url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz";
hash = "sha256-LI0xIkWzmotzSsmo60URC8A94wiJKOV0MQqZDTuAAkE=";
hash = "sha256-qCX2/37+2wm7nKdXJ6tDEmeXAA+Jd123LI2VIL9IHpw=";
};
nativeBuildInputs = [
+4 -4
View File
@@ -12,12 +12,12 @@
let
# finalAttrs when 🥺 (buildGoModule does not support them)
# https://github.com/NixOS/nixpkgs/issues/273815
version = "1.8.4";
version = "1.9.1";
src = fetchFromGitHub {
owner = "thomiceli";
repo = "opengist";
tag = "v${version}";
hash = "sha256-vpl3ztLHeVZndAwDgobfiI+3Xu3CFU38qgXy83p06As=";
hash = "sha256-Zjn38OGnDtgD2OfIhgUxWo0Cx+ZmNv6UjJanASbjiYU=";
};
frontend = buildNpmPackage {
@@ -40,13 +40,13 @@ let
cp -R public $out
'';
npmDepsHash = "sha256-l09TPGBGhWcsl3x14ovilDd1zZWv4XzFCAmAfapKtAE=";
npmDepsHash = "sha256-Uh+oXd//G/lPAMXRxijjEOpQNmeXK/XCIU7DJN3ujaY=";
};
in
buildGoModule {
pname = "opengist";
inherit version src;
vendorHash = "sha256-mLFjRL4spAWuPLVOtt88KH+p2g9lGCYzaHokVxdrLOw=";
vendorHash = "sha256-aqfr3yGyTXDtZDU8d1lbWWvFfY4fo6/PsSDwpiDtM90=";
tags = [ "fs_embed" ];
ldflags = [
"-s"
+6 -3
View File
@@ -1,11 +1,12 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts common-updater-scripts
#!nix-shell -i bash -p bash curl coreutils jq git prefetch-npm-deps moreutils common-updater-scripts
# shellcheck shell=bash
set -eou pipefail
set -x
NIXPKGS_DIR="$PWD"
NIXPKGS_DIR="$(git rev-parse --show-toplevel)"
SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
# Get latest release
@@ -27,7 +28,9 @@ fi
echo "Updating opengist $oldVersion -> $latestVersion"
pushd "$NIXPKGS_DIR" >/dev/null || exit 1
update-source-version opengist "${latestVersion}"
popd >/dev/null
pushd "$SCRIPT_DIR" >/dev/null || exit 1
@@ -43,7 +46,7 @@ popd >/dev/null
# nix-prefetch broken due to ninja finalAttrs.src.rev
# nix-update with goModules broken for this package
setKV () {
setKV() {
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${SCRIPT_DIR}/package.nix"
}
+1 -1
View File
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
env.OXC_VERSION = version;
cargoBuildFlags = [ "--bin=oxlint" ];
cargoBuildFlags = [ "--bin=oxlint" "--bin=oxc_language_server" ];
cargoTestFlags = cargoBuildFlags;
meta = with lib; {
+7 -2
View File
@@ -6,15 +6,16 @@
libfido2,
pam,
openssl,
nixosTests,
}:
stdenv.mkDerivation rec {
pname = "pam_u2f";
version = "1.3.1";
version = "1.3.2";
src = fetchurl {
url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz";
hash = "sha256-mhNUmUf4RPazq2kdca+09vAKRdFl/tJ7AcZsB3UKk4c=";
hash = "sha256-OL59GJcnHLP+45HSODs1r8EmrUMakanebpkQjBLMlJA=";
};
nativeBuildInputs = [ pkg-config ];
@@ -36,6 +37,10 @@ stdenv.mkDerivation rec {
EOF
'';
passthru.tests = {
pam_u2f = nixosTests.pam-u2f;
};
meta = with lib; {
homepage = "https://developers.yubico.com/pam-u2f/";
description = "PAM module for allowing authentication with a U2F device";
@@ -1,38 +1,43 @@
{
lib,
stdenv,
fetchFromGitHub,
wrapQtAppsHook,
cmake,
qhull,
flann,
boost,
vtk,
eigen,
pkg-config,
qtbase,
libusb1,
libpcap,
libtiff,
libXt,
libpng,
Cocoa,
AGL,
OpenGL,
config,
fetchFromGitHub,
# nativeBuildInputs
cmake,
libsForQt5,
pkg-config,
# buildInputs
eigen,
libXt,
libpcap,
libusb1,
# nativeBuildInputs
boost186,
flann,
libpng,
libtiff,
qhull,
vtk,
gitUpdater,
cudaSupport ? config.cudaSupport,
cudaPackages,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pcl";
version = "1.13.0";
version = "1.15.0-rc1";
src = fetchFromGitHub {
owner = "PointCloudLibrary";
repo = "pcl";
rev = "${pname}-${version}";
sha256 = "sha256-JDiDAmdpwUR3Sff63ehyvetIFXAgGOrI+HEaZ5lURps=";
tag = "pcl-${finalAttrs.version}";
hash = "sha256-T/zvev1x4w87j6Zn9dpqwIQfmfg2MsHt2Xto8Z1vhuQ=";
};
# remove attempt to prevent (x86/x87-specific) extended precision use
@@ -42,26 +47,21 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
pkg-config
cmake
wrapQtAppsHook
libsForQt5.wrapQtAppsHook
pkg-config
] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
buildInputs =
[
eigen
libusb1
libpcap
qtbase
libXt
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
AGL
];
buildInputs = [
eigen
libXt
libpcap
libsForQt5.qtbase
libusb1
];
propagatedBuildInputs = [
boost
boost186
flann
libpng
libtiff
@@ -69,17 +69,24 @@ stdenv.mkDerivation rec {
vtk
];
cmakeFlags =
lib.optionals stdenv.hostPlatform.isDarwin [
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
]
++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ];
cmakeFlags = lib.optionals cudaSupport [
(lib.cmakeBool "WITH_CUDA" true)
];
passthru = {
updateScript = gitUpdater { rev-prefix = "pcl-"; };
};
meta = {
homepage = "https://pointclouds.org/";
description = "Open project for 2D/3D image and point cloud processing";
changelog = "https://github.com/PointCloudLibrary/pcl/blob/pcl-${finalAttrs.version}/CHANGES.md";
license = lib.licenses.bsd3;
maintainers = [ ];
maintainers = with lib.maintainers; [ GaetanLepage ];
platforms = with lib.platforms; linux ++ darwin;
badPlatforms = [
# fatal error: 'omp.h' file not found
lib.systems.inspect.patterns.isDarwin
];
};
}
})
@@ -7,13 +7,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plasmusic-toolbar";
version = "2.1.1";
version = "2.3.0";
src = fetchFromGitHub {
owner = "ccatterina";
repo = "plasmusic-toolbar";
tag = "v${finalAttrs.version}";
hash = "sha256-dQG6YOILsTsxbMfdrThodokixM2PrXPd5nB7+NWxFXg=";
hash = "sha256-YxhZ4XhHCbEPVrc+qqO+phGnEf0nnKiDVRB5K4wjR/Q=";
};
installPhase = ''
+8 -5
View File
@@ -7,6 +7,9 @@
let
platforms = {
aarch64-darwin = {
folder = ".";
};
aarch64-linux = {
folder = "aarch64";
ld-linux = "ld-linux-aarch64.so.1";
@@ -33,22 +36,22 @@ let
download =
if stdenv.hostPlatform.isDarwin then
{
extension = "macos.zip";
hash = "sha256-MnL6lH7q/BrACG4fFJNfnvoh0JClVeaJIlX+XIj2aG4=";
suffix = "20230322-mac.zip";
hash = "sha256-Lj63k0UgYECuOg0NDs/prQHZL+UAK4oWdqZWMqVoQOE=";
}
else
{
extension = "linux.tar.gz";
suffix = "20200115-linux.tar.gz";
hash = "sha256-rDi7pvDeKQM96GZTjDr6ZDQTGbaVu+OI77xf2egw6Sg=";
};
in
stdenv.mkDerivation rec {
pname = "pngout";
version = "20200115";
version = "20230322";
src = fetchurl {
inherit (download) hash;
url = "http://static.jonof.id.au/dl/kenutils/pngout-${version}-${download.extension}";
url = "https://www.jonof.id.au/files/kenutils/pngout-${download.suffix}";
};
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ unzip ];
+5 -3
View File
@@ -10,21 +10,23 @@
buildNpmPackage rec {
pname = "pocket-casts";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "felicianotech";
repo = "pocket-casts-desktop-app";
rev = "v${version}";
hash = "sha256-PwM9B2Qx4TxlcahQM/KEBTzWKc4cNrleDEYKg0m8bVE=";
hash = "sha256-5xn2uAjqIyWKQAruHLyho72HCYpbxyWlcTQ3LXXZy6M=";
};
npmDepsHash = "sha256-WPuXTcHCKrwepITGtZFCIwylVAdYlI3cNsuhqx1AEYI=";
npmDepsHash = "sha256-nfTn2rs0XGraebI0rKlTECccc7KpRXf/+qOjj/5GPAw=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
dontNpmBuild = true;
makeCacheWritable = true;
desktopItems = [
(makeDesktopItem {
name = pname;
+4 -4
View File
@@ -10,14 +10,14 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "polylux2pdfpc";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "andreasKroepelin";
owner = "polylux-typ";
repo = "polylux";
rev = "v${version}";
sparseCheckout = [ dirname ];
hash = "sha256-GefX7XsUfOMCp2THstSizRGpKAoq7yquVukWQjGuFgc=";
hash = "sha256-41FgRejonvVTmE89WGm0Cqumm8lb6kkfxtkWV74UKJA=";
};
sourceRoot = "${src.name}/${dirname}";
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Tool to make pdfpc interpret slides created by polylux correctly";
homepage = "https://github.com/andreasKroepelin/polylux/tree/main/pdfpc-extractor";
homepage = "https://github.com/polylux-typ/polylux/tree/main/pdfpc-extractor";
license = licenses.mit;
mainProgram = "polylux2pdfpc";
maintainers = [ maintainers.diogotcorreia ];
+2 -2
View File
@@ -6,12 +6,12 @@
let
pname = "polypane";
version = "23.0.1";
version = "23.1.0";
src = fetchurl {
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
name = "${pname}-${version}.AppImage";
sha256 = "sha256-phOuTka8S/aUOem6+rKx18yhRoArWLQYwxqqFF269XA=";
sha256 = "sha256-6XKosi5ukkrVtG5K6tUDgvqbOQ0RdrDHuYHhIS+Idyg=";
};
appimageContents = appimageTools.extractType2 {
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "protoc-gen-go";
version = "1.36.4";
version = "1.36.5";
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "protobuf-go";
rev = "v${version}";
hash = "sha256-lDhg72i/5J4PMsdMPBthEpV3gFqr+ds3O4+rj6AZoMs=";
hash = "sha256-fotgvzHRRCDWRyGM9nP+BFhE0vN5/0jQlb5moOhDAWc=";
};
vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E=";
+3 -3
View File
@@ -6,16 +6,16 @@
let
self = buildGoModule {
pname = "reader";
version = "0.4.6";
version = "0.4.7";
src = fetchFromGitHub {
owner = "mrusme";
repo = "reader";
tag = "v${self.version}";
hash = "sha256-Z0mDRL02wZfmPRVDTDV85MqI5Ztctqen7PmOSW5Ee48=";
hash = "sha256-Xg6ndfxKOfiIz654HcnhdvBGydOSSODBp8LnYxmqb4o=";
};
vendorHash = "sha256-6k6Zmwdpc4rBsahtU9nJmTUqfDZi6EeaJGVeLFzbY34=";
vendorHash = "sha256-dr/y4BBBe5K9U24ikLzYA+B2mzTGpFuFqoj5OLXtUG4=";
meta = {
description = "Lightweight tool offering better readability of web pages on the CLI";
+4 -3
View File
@@ -11,13 +11,13 @@
buildGo123Module rec {
pname = "resticprofile";
version = "0.28.0";
version = "0.29.1";
src = fetchFromGitHub {
owner = "creativeprojects";
repo = "resticprofile";
tag = "v${version}";
hash = "sha256-Ab+XesAw/GkNEGwAp1ERUlfDlI9Kxmd0UnS52v+nWIs=";
hash = "sha256-6s58rI+YMu6sCV8UsG9GOdF46Br3cMWIUqciVd2d4dY=";
};
postPatch = ''
@@ -32,9 +32,10 @@ buildGo123Module rec {
'';
vendorHash = "sha256-LLFdVB4n07Sq/QH1C7rutdpzfhkJvM9lvRg5exyYixM=";
vendorHash = "sha256-N39zPGos5EYRXGylsHFSjJ4EcQ9jahBOGV8xn7fF7gc=";
ldflags = [
"-X main.version=${version}"
"-X main.commit=${src.rev}"
"-X main.date=unknown"
"-X main.builtBy=nixpkgs"
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "rke";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
hash = "sha256-BatjRfUosYD5e3TNzgREuMeGSA2lknZMG3/y+0V2NkU=";
hash = "sha256-9b42F9czbck5BY3CwpIhpxw2QdXRU3o9/bGvEMUTis8=";
};
vendorHash = "sha256-Lp14xvhn4xzOurTa8sRk0A1X1c/sj1clw7niVTRgNeM=";
@@ -2,46 +2,53 @@
lib,
stdenv,
fetchFromGitHub,
pkg-config,
# nativeBuildInputs
cmake,
libsForQt5,
pkg-config,
wrapGAppsHook3,
# buildInputs
opencv,
pcl,
liblapack,
xorg,
libusb1,
eigen,
wrapQtAppsHook,
qtbase,
g2o,
ceres-solver,
zed-open-capture,
hidapi,
octomap,
freenect,
libdc1394,
libGL,
libGLU,
vtkWithQt5,
wrapGAppsHook3,
liblapack,
xorg,
zed-open-capture,
hidapi,
# passthru
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rtabmap";
version = "0.21.4.1";
src = fetchFromGitHub {
owner = "introlab";
repo = "rtabmap";
tag = version;
tag = finalAttrs.version;
hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk=";
};
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
pkg-config
wrapQtAppsHook
wrapGAppsHook3
];
buildInputs = [
## Required
opencv
@@ -61,7 +68,7 @@ stdenv.mkDerivation rec {
freenect
libdc1394
# librealsense - missing includedir
qtbase
libsForQt5.qtbase
libGL
libGLU
vtkWithQt5
@@ -72,11 +79,18 @@ stdenv.mkDerivation rec {
# Disable warnings that are irrelevant to us as packagers
cmakeFlags = [ "-Wno-dev" ];
meta = with lib; {
passthru = {
updateScript = gitUpdater { };
};
meta = {
description = "Real-Time Appearance-Based 3D Mapping";
homepage = "https://introlab.github.io/rtabmap/";
license = licenses.bsd3;
maintainers = with maintainers; [ marius851000 ];
platforms = with platforms; linux;
changelog = "https://github.com/introlab/rtabmap/releases/tag/${finalAttrs.version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ marius851000 ];
platforms = with lib.platforms; linux;
# pcl/io/io.h: No such file or directory
broken = true;
};
}
})
+91 -52
View File
@@ -6,7 +6,7 @@
pkg-config,
python3,
rustPlatform,
stdenv,
stdenvNoCC,
lib,
wayland,
xorg,
@@ -19,25 +19,46 @@
gsettings-desktop-schemas,
glib,
libxkbcommon,
openh264,
darwin,
}:
let
version = "nightly-2025-01-04";
pname = "ruffle";
version = "nightly-2025-01-25";
# TODO: Remove overridden derivation once ruffle accepts upstream openh264-2.5.0
openh264-241 =
if stdenvNoCC.hostPlatform.isLinux then
openh264.overrideAttrs (_: rec {
version = "2.4.1";
src = fetchFromGitHub {
owner = "cisco";
repo = "openh264";
tag = "v${version}";
hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI=";
};
postPatch = null;
})
else
null;
in
rustPlatform.buildRustPackage {
pname = "ruffle";
inherit version;
inherit pname version;
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = "ruffle";
rev = version;
hash = "sha256-MxYl5fTTNerCwG3w34cltb6aasP6TvGRkvwf77lKIgs=";
repo = pname;
tag = version;
hash = "sha256-JLh0tatP70rYo2QXLKu6M9jJ1gFpY76sYaUJqW9U4E0=";
};
patches = [ ./remove-deterministic-feature.patch ];
useFetchCargoVendor = true;
cargoHash = "sha256-PbNp/V+xmU6Lo24a6pd9XoT/LQmINztjOHKoikG9N4Y=";
nativeBuildInputs =
[ jre_minimal ]
++ lib.optionals stdenv.hostPlatform.isLinux [
++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
glib
gsettings-desktop-schemas
makeWrapper
@@ -45,10 +66,10 @@ rustPlatform.buildRustPackage {
python3
wrapGAppsHook3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
lib.optionals stdenvNoCC.hostPlatform.isLinux [
alsa-lib
cairo
gtk3
@@ -62,63 +83,81 @@ rustPlatform.buildRustPackage {
vulkan-loader
udev
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
dontWrapGApps = true;
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
install -Dm644 -t $out/share/icons/hicolor/scalable/apps/ desktop/packages/linux/rs.ruffle.Ruffle.svg
install -Dm644 -t $out/share/applications/ desktop/packages/linux/rs.ruffle.Ruffle.desktop
substituteInPlace $out/share/applications/rs.ruffle.Ruffle.desktop \
--replace-fail "Exec=ruffle %u" "Exec=ruffle_desktop %u"
install -Dm644 -t $out/share/metainfo/ desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml
'';
preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf $out/bin/ruffle_desktop \
--add-needed libxkbcommon-x11.so \
--add-needed libwayland-client.so \
--add-rpath ${libxkbcommon}/lib:${wayland}/lib
'';
postFixup =
''
# This name is too generic
mv $out/bin/exporter $out/bin/ruffle_exporter
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
vulkanWrapperArgs+=(
--prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
)
wrapProgram $out/bin/ruffle_exporter \
"''${vulkanWrapperArgs[@]}"
wrapProgram $out/bin/ruffle_desktop \
"''${vulkanWrapperArgs[@]}" \
"''${gappsWrapperArgs[@]}"
'';
++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
cargoBuildFlags = [ "--workspace" ];
useFetchCargoVendor = true;
cargoHash = "sha256-q+9yhUjYolPlBt6W1xJPoyE7DgqDffEhkQqJmSX4y3Y=";
postInstall =
''
# Namespace binaries with "ruffle_"
mv $out/bin/exporter $out/bin/ruffle_exporter
mv $out/bin/mocket $out/bin/ruffle_mocket
mv $out/bin/stub-report $out/bin/ruffle_stub-report
mv $out/bin/build_playerglobal $out/bin/ruffle_build_playerglobal
# This name is too specific
mv $out/bin/ruffle_desktop $out/bin/ruffle
''
+ lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop \
-t $out/share/applications/
install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.svg \
-t $out/share/icons/hicolor/scalable/apps/
install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml \
-t $out/share/metainfo/
rm $out/bin/ruffle_web_safari
'';
preFixup = lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
patchelf $out/bin/ruffle \
--add-needed libxkbcommon-x11.so \
--add-needed libwayland-client.so \
--add-needed libopenh264.so \
--add-rpath ${libxkbcommon}/lib:${wayland}/lib:${openh264-241}/lib
'';
dontWrapGApps = true;
postFixup = lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
vulkanWrapperArgs+=(
--prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
)
wrapProgram $out/bin/ruffle_exporter \
"''${vulkanWrapperArgs[@]}"
wrapProgram $out/bin/ruffle \
"''${vulkanWrapperArgs[@]}" \
"''${gappsWrapperArgs[@]}"
'';
meta = {
description = "Cross platform Adobe Flash Player emulator";
longDescription = ''
Ruffle is a cross platform emulator for running and preserving
Adobe Flash content. It is capable of running ActionScript 1, 2
and 3 programs with machine-native performance thanks to being
written in the Rust programming language.
This package for ruffle also includes the `exporter` and
`scanner` utilities which allow for generating screenshots as
PNGs and parsing `.swf` files in bulk respectively.
'';
homepage = "https://ruffle.rs/";
downloadPage = "https://ruffle.rs/downloads";
changelog = "https://github.com/ruffle-rs/ruffle/releases/tag/${version}";
license = [
lib.licenses.mit
lib.licenses.asl20
];
maintainers = [
lib.maintainers.govanify
lib.maintainers.jchw
lib.maintainers.normalcea
];
mainProgram = "ruffle";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
mainProgram = "ruffle_desktop";
};
}
@@ -0,0 +1,52 @@
diff --git a/exporter/Cargo.toml b/exporter/Cargo.toml
index 93066a30d..0f8b71ae4 100644
--- a/exporter/Cargo.toml
+++ b/exporter/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
[dependencies]
clap = { workspace = true }
futures = { workspace = true }
-ruffle_core = { path = "../core", features = ["deterministic", "default_font"] }
+ruffle_core = { path = "../core", features = ["default_font"] }
ruffle_render_wgpu = { path = "../render/wgpu", features = ["clap"] }
image = { workspace = true, features = ["png"] }
walkdir = { workspace = true }
diff --git a/scanner/Cargo.toml b/scanner/Cargo.toml
index 59781ba79..40cf54c24 100644
--- a/scanner/Cargo.toml
+++ b/scanner/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
[dependencies]
clap = { workspace = true }
-ruffle_core = { path = "../core", features = ["deterministic"] }
+ruffle_core = { path = "../core" }
log = { workspace = true }
walkdir = { workspace = true }
serde = { workspace = true, features = ["derive"] }
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 26bfc9a89..b7342b662 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -27,7 +27,7 @@ ruffle_render_wgpu = { path = "../render/wgpu", optional = true }
regex = "1.11.1"
[dev-dependencies]
-ruffle_core = { path = "../core", features = ["deterministic", "timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "test_only_as3"] }
+ruffle_core = { path = "../core", features = ["timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "test_only_as3"] }
ruffle_test_framework = { path = "framework" }
libtest-mimic = "0.8.1"
walkdir = { workspace = true }
diff --git a/tests/framework/Cargo.toml b/tests/framework/Cargo.toml
index ffc59e25b..639028578 100644
--- a/tests/framework/Cargo.toml
+++ b/tests/framework/Cargo.toml
@@ -11,7 +11,7 @@ version.workspace = true
workspace = true
[dependencies]
-ruffle_core = { path = "../../core", features = ["deterministic", "timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "serde"] }
+ruffle_core = { path = "../../core", features = ["timeline_debug", "avm_debug", "audio", "mp3", "aac", "default_font", "serde"] }
ruffle_render = { path = "../../render", features = ["serde"] }
ruffle_input_format = { path = "../input-format" }
ruffle_socket_format = { path = "../socket-format" }
File diff suppressed because it is too large Load Diff
@@ -14,21 +14,26 @@
rustPlatform.buildRustPackage rec {
pname = "rustdesk-server";
version = "1.1.12";
version = "1.1.14";
src = fetchFromGitHub {
owner = "rustdesk";
repo = "rustdesk-server";
rev = version;
hash = "sha256-5QyrI3KLZZcQpudYqghrotLrLjSOhdDFR5eqnJC/0fU=";
hash = "sha256-5LRMey1cxmjLg1s9RtVwgPjHjwYLSQHa6Tyv7r/XEQs=";
fetchSubmodules = true;
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"async-speed-limit-0.3.1" = "sha256-iOel6XA07RPrBjQAFLnxXX4VBpDrYZaqQc9clnsOorI=";
"confy-0.4.0" = "sha256-e91cvEixhpPzIthAxzTa3fDY6eCsHUy/eZQAqs7QTDo=";
"tokio-socks-0.5.1" = "sha256-inmAJk0fAlsVNIwfD/M+htwIdQHwGSTRrEy6N/mspMI=";
"confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU=";
"default_net-0.1.0" = "sha256-wwVcnS99I1NJFeSihy5YrB5p0y+OHXTX81DQ+TtyFBU=";
"machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE=";
"reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc=";
"sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4=";
"tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI=";
};
};
+78
View File
@@ -0,0 +1,78 @@
{
lib,
stdenv,
cmake,
fetchFromGitHub,
fetchpatch,
}:
stdenv.mkDerivation {
pname = "safestringlib";
# Latest release is 1.2.0 and has compilation issues
version = "1.2.0-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "intel";
repo = "safestringlib";
rev = "e99c03cfafdce5311c4dbf1fd3f916ccc6e300be";
hash = "sha256-d+6YDtMtdaS2eW0eIfuwzdQRiExsoexL3fKj7C2zENM=";
};
outputs = [
"out"
];
nativeBuildInputs = [ cmake ];
cmakeFlags = [
(lib.cmakeBool "BUILD_UNITTESTS" true)
];
patches = [
# https://github.com/intel/safestringlib/issues/74
(fetchpatch {
name = "darwin-fix";
url = "https://github.com/intel/safestringlib/pull/75/commits/3ff9c6234be7dd4ee1dd5cdc2ccbb2c7541adfec.patch";
hash = "sha256-4HS7XyKPQSmKczaMCi1s6NxgTNzRZXTds2CXBTbpuAM=";
})
];
# see https://github.com/bwa-mem2/bwa-mem2/issues/93
# Skip wmemset too
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
sed -i 's/memset_s/memset8_s/g' include/safe_mem_lib.h
sed -i 's/memset_s/memset8_s/g' safeclib/memset16_s.c
sed -i 's/memset_s/memset8_s/g' safeclib/memset32_s.c
sed -i 's/memset_s/memset8_s/g' safeclib/memset_s.c
sed -i 's/memset_s/memset8_s/g' safeclib/wmemset_s.c
sed -i 's/ memset_s/ memset8_s/g' unittests/*.c
sed -i 's/ wmemset_s/ wmemset8_s/g' unittests/*.c
'';
checkPhase = ''
runHook preCheck
cd unittests
./safestring_test
runHook postCheck
'';
doCheck = true;
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp ../libsafestring_static.a $out/lib/libsafestring.a
mkdir -p $out/
cp -r ../../include $out/
runHook postInstall
'';
meta = {
homepage = "https://github.com/intel/safestringlib";
description = "Safer replacements for C library functions that prevent serious security vulnerabilities";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ apraga ];
};
}
+9 -3
View File
@@ -6,17 +6,23 @@
rustPlatform.buildRustPackage rec {
pname = "scooter";
version = "0.2.1";
version = "0.2.3";
src = fetchFromGitHub {
owner = "thomasschafer";
repo = "scooter";
rev = "v${version}";
hash = "sha256-dojVVBdXBtWvD/YIfouRmnsf1AWgfB3CYjH2KhtCsvI=";
hash = "sha256-1BotQpkcw0RwPmHjQ/uoHKwerToxQ3OzHCvE/mbnSug";
};
useFetchCargoVendor = true;
cargoHash = "sha256-yQhnN1GoosUx8YjUJsjtg2okDbSOFx0sUV26ggRDGI8=";
cargoHash = "sha256-BN5h6IENeogkM79uZONNushEFLM/vw+QFyPjz1V1vVk";
checkFlags = [
# failed only for buildRustPackage
# might be related to https://ryantm.github.io/nixpkgs/languages-frameworks/rust/#tests-relying-on-the-structure-of-the-target-directory
"--skip=test_search_current_dir"
];
meta = {
description = "Interactive find and replace in the terminal";
+398 -226
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -18,13 +18,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "snx-rs";
version = "2.9.0";
version = "3.0.3";
src = fetchFromGitHub {
owner = "ancwrd1";
repo = "snx-rs";
rev = "v2.9.0";
hash = "sha256-9uTawt9Lk3YJbw8hzrP91bEaPGT1wZehrmCWDKYrw5w=";
tag = "v${version}";
hash = "sha256-TrA0uwzBhITCQ0ql8z1og1iNbH4eJlmzXFPbOpnN5do=";
};
passthru.updateScript = nix-update-script { };
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"isakmp-0.1.0" = "sha256-H8yLwIUzlaPA0kJEfdGn8jvSjs27zWeIFdHlF3HitRk=";
"isakmp-0.1.0" = "sha256-S34NN57l5MzyGXso01GSMCGPiYYEJc1mDluXoWQ0Y1k=";
};
};
+76 -6
View File
@@ -99,6 +99,16 @@
"version": "11.1.0",
"hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM="
},
{
"pname": "Azure.AI.OpenAI",
"version": "2.2.0-beta.1",
"hash": "sha256-H173lh1HdNB2x7SjrvLPcQKUmxn8PKOJ8aa2HM07w/w="
},
{
"pname": "Azure.Core",
"version": "1.44.1",
"hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk="
},
{
"pname": "CommunityToolkit.Mvvm",
"version": "8.3.2",
@@ -131,29 +141,39 @@
},
{
"pname": "LiveChartsCore",
"version": "2.0.0-rc5",
"hash": "sha256-NHgYbeIdAoZlrC6QgVb1oLo3dlo17R8yTbPgiHMmJZc="
"version": "2.0.0-rc5.1",
"hash": "sha256-B0cMspfPvhDTbzyZhL9Ntn9/wTYjP/JcWAlM8MxfcEQ="
},
{
"pname": "LiveChartsCore.SkiaSharpView",
"version": "2.0.0-rc5",
"hash": "sha256-zppOFKHGn2HJMP8AAuk6mxJXqvgjfN7o8f0sInUWZGc="
"version": "2.0.0-rc5.1",
"hash": "sha256-lgePmk/Fqk7c4eq5z9JhmrfQhCUBYPxga1NcKmSE9nc="
},
{
"pname": "LiveChartsCore.SkiaSharpView.Avalonia",
"version": "2.0.0-rc5",
"hash": "sha256-xyFEZWWkRlBi8GNCDpyOUzt6aEe+9sR1+VN2yY59mhg="
"version": "2.0.0-rc5.1",
"hash": "sha256-IMJ09v5dsN5wvlhjsPKOfOG0vTDCwJ9QuZEMWyvoxH8="
},
{
"pname": "MicroCom.Runtime",
"version": "0.11.0",
"hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "6.0.0",
"hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
},
{
"pname": "Onigwrap",
"version": "1.0.6",
"hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU="
},
{
"pname": "OpenAI",
"version": "2.2.0-beta.1",
"hash": "sha256-XtzTi7K+wIOvqzhN5qdHj+M5tcIASJpYtd5cpx/M3Gw="
},
{
"pname": "SkiaSharp",
"version": "2.88.9",
@@ -184,16 +204,66 @@
"version": "2.88.9",
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
},
{
"pname": "System.ClientModel",
"version": "1.1.0",
"hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM="
},
{
"pname": "System.ClientModel",
"version": "1.2.1",
"hash": "sha256-MNFNrCAhD+vj97gVXdJIm3QmY++y25zBZtiIXrGdQ2c="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "6.0.1",
"hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
},
{
"pname": "System.IO.Pipelines",
"version": "8.0.0",
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
},
{
"pname": "System.Memory.Data",
"version": "6.0.0",
"hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.5.0",
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
},
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0",
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
{
"pname": "System.Text.Encodings.Web",
"version": "6.0.0",
"hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
},
{
"pname": "System.Text.Json",
"version": "6.0.0",
"hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="
},
{
"pname": "System.Text.Json",
"version": "6.0.10",
"hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="
},
{
"pname": "System.Text.Json",
"version": "8.0.5",
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.5.4",
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
},
{
"pname": "TextMateSharp",
"version": "1.0.59",
+2 -2
View File
@@ -19,13 +19,13 @@
buildDotnetModule (finalAttrs: {
pname = "sourcegit";
version = "2025.03";
version = "2025.04";
src = fetchFromGitHub {
owner = "sourcegit-scm";
repo = "sourcegit";
tag = "v${finalAttrs.version}";
hash = "sha256-l1M3ix0HY87y2ES/iwT2Ju/Mwb8CCmnz95amHlYKFS4=";
hash = "sha256-PyJvmWTZPOJcejD23zGJ28RCEnpXqWcqxuHBlAkRTcQ=";
};
patches = [ ./fix-darwin-git-path.patch ];
+20 -30
View File
@@ -10,8 +10,8 @@
let
apexcharts = fetchurl {
url = "https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js";
hash = "sha256-2sxp9+shRA5LMxzhgx+fpeQPIY2ZWgBdt4mp5V2Yn+E=";
url = "https://cdn.jsdelivr.net/npm/apexcharts@4.3.0/dist/apexcharts.min.js";
hash = "sha256-zceUTsCKa8Y2SqjqZjLjifXQDnqsvKRTmT8fTIUix/4=";
};
tablerCss = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css";
@@ -22,37 +22,33 @@ let
hash = "sha256-Aa7AUOaz6hJLiUzQStZTy2VPOZyg0ViSo2MCzpDU1tY=";
};
tablerJs = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js";
hash = "sha256-ygO5OTRUtYxDDkERRwBCfq+fmakhM6ybwfl6gCCPlAQ=";
};
listJsFixed = fetchurl {
url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js";
hash = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM=";
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta21/dist/js/tabler.min.js";
hash = "sha256-c01wM5Q9GIKYbvvjIaxt67o1CpIBkFMMmz1Dgsi0K7A=";
};
tablerIcons = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg";
hash = "sha256-lEUAtxI+NffqLDllirLgcCRjEgbeCaz9Gkn3Tu9e9F4=";
url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.21.0/dist/tabler-sprite.svg";
hash = "sha256-TUlx6LLnZ7sDN7Xzt+/zAuxLYgUkQSqRgdQm8H4cohY=";
};
tomselect = fetchurl {
url = "https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js";
hash = "sha256-51NcdIM8GseVFFmg8mUWDxfhjLCA+n8kw/Ojyo+6Hjk=";
url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js";
hash = "sha256-Cb1Xmb9qQO8I1mMVkz4t2bT8l7HX+1JeKncGBSytSHQ=";
};
in
rustPlatform.buildRustPackage rec {
pname = "sqlpage";
version = "0.29.0";
version = "0.32.1";
src = fetchFromGitHub {
owner = "lovasoa";
repo = "SQLpage";
rev = "v${version}";
hash = "sha256-wI+nXrjX98vqyCE6Ofa5KxKUvpLfHqd7KFCsILuOnGk=";
tag = "v${version}";
hash = "sha256-PfBZCfwXL5/ItBFrEod27BIuWbWR9gVGTfbdxQ/IIuQ=";
};
postPatch = ''
substituteInPlace sqlpage/apexcharts.js \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.52.0/dist/apexcharts.min.js */' \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@4.3.0/dist/apexcharts.min.js */' \
"$(cat ${apexcharts})"
substituteInPlace sqlpage/sqlpage.css \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \
@@ -61,39 +57,33 @@ rustPlatform.buildRustPackage rec {
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css */' \
"$(cat ${tablerVendorsCss})"
substituteInPlace sqlpage/sqlpage.js \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js */' \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta21/dist/js/tabler.min.js */' \
"$(cat ${tablerJs})"
substituteInPlace sqlpage/sqlpage.js \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \
"$(cat ${listJsFixed})"
substituteInPlace sqlpage/tabler-icons.svg \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg */' \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.21.0/dist/tabler-sprite.svg */' \
"$(cat ${tablerIcons})"
substituteInPlace sqlpage/tomselect.js \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js */' \
--replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js */' \
"$(cat ${tomselect})"
'';
useFetchCargoVendor = true;
cargoHash = "sha256-pXmWXHoGbo1YRUjHGVEMZDk4YYqP8XwcDSPWX474Z2c=";
nativeBuildInputs = [
pkg-config
];
cargoHash = "sha256-HbNVBMysowIV62l7eSHu4YaBMIku+IT11jlEgWrjaWE=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
sqlite
zstd
];
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;
};
env.ZSTD_SYS_USE_PKG_CONFIG = true;
meta = {
description = "SQL-only webapp builder, empowering data analysts to build websites and applications quickly";
homepage = "https://github.com/lovasoa/SQLpage";
changelog = "https://github.com/lovasoa/SQLpage/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/lovasoa/SQLpage/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dit7ya ];
mainProgram = "sqlpage";
+3 -3
View File
@@ -9,13 +9,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tabby-agent";
version = "0.23.1";
version = "0.24.0";
src = fetchFromGitHub {
owner = "TabbyML";
repo = "tabby";
tag = "v${finalAttrs.version}";
hash = "sha256-KiADf4vjdMMbD5edSEE4LPphaDP64E0nqLLJ0lVnLDE=";
hash = "sha256-8SUeqIta1CFLVtX7GxOeczSDyi50TTGgyZK2kZJsA+0=";
};
nativeBuildInputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-RMa4fuR6L1BM+QmLsZ7i42jtGAQXkVQvv1hh0lr+Ky8=";
hash = "sha256-fQnMLjVhscLN0HFyP7ArjytTryZtr1D+gxrvMT0c40k=";
};
passthru.updateScript = nix-update-script {
-7316
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More