Merge staging-next into staging
This commit is contained in:
@@ -166,5 +166,8 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ vonfry ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
vonfry
|
||||
zacharyarnaise
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "145.0.7632.45",
|
||||
"version": "145.0.7632.67",
|
||||
"chromedriver": {
|
||||
"version": "145.0.7632.46",
|
||||
"hash_darwin": "sha256-YlrKWY4DAef7/GsKtieINI2JUrHpWhVaC80rkYIkyVI=",
|
||||
"hash_darwin_aarch64": "sha256-6TJw2tYOYXmIANa2X7pZHCrIcW8fKHo5b8ReHepVlhE="
|
||||
"version": "145.0.7632.68",
|
||||
"hash_darwin": "sha256-ZdAqfL/eWKZPl8+8aFDRfNIE40WWrHGEICo3IuJJbSQ=",
|
||||
"hash_darwin_aarch64": "sha256-4/IK3uZs4PPuZoxJrJXhxEvJay2HfAk272S143SLnZA="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
@@ -21,8 +21,8 @@
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "7ad2aeb6be38786b2bf653d667d3df01e68d3c40",
|
||||
"hash": "sha256-l/gxUE0itdUQXLRAR2cp72hu21dgecZvWLC5Br0SPuo=",
|
||||
"rev": "87da8db4955d72b610645049c3458f787e7aaf0e",
|
||||
"hash": "sha256-1yOwFxisQ8QHQ0OZ2bhmZtxTPzPAiHnbDdHha8A8sFU=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
pulseaudio,
|
||||
nodejs,
|
||||
yt-dlp,
|
||||
opusTools,
|
||||
opus-tools,
|
||||
gst_all_1,
|
||||
enableSonos ? true,
|
||||
qtwayland,
|
||||
@@ -23,7 +23,7 @@ let
|
||||
sox
|
||||
flac
|
||||
lame
|
||||
opusTools
|
||||
opus-tools
|
||||
gst_all_1.gstreamer
|
||||
nodejs
|
||||
ffmpeg
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
flacSupport ? true,
|
||||
flac,
|
||||
opusSupport ? false,
|
||||
opusTools,
|
||||
opus-tools,
|
||||
wavpackSupport ? false,
|
||||
wavpack,
|
||||
#, musepackSupport ? false, TODO: mpcenc
|
||||
@@ -29,7 +29,7 @@ let
|
||||
lib.optional mp3Support lame
|
||||
++ lib.optional oggSupport vorbis-tools
|
||||
++ lib.optional flacSupport flac
|
||||
++ lib.optional opusSupport opusTools
|
||||
++ lib.optional opusSupport opus-tools
|
||||
++ lib.optional wavpackSupport wavpack
|
||||
++ lib.optional monkeysAudioSupport monkeys-audio
|
||||
++ [ cdparanoia ];
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
findutils,
|
||||
flac,
|
||||
lame,
|
||||
opusTools,
|
||||
opus-tools,
|
||||
procps,
|
||||
sox,
|
||||
}:
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
findutils
|
||||
sox
|
||||
procps
|
||||
opusTools
|
||||
opus-tools
|
||||
lame
|
||||
flac
|
||||
]
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cpx";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "11happy";
|
||||
repo = "cpx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tZ9NQUwnbONpJ59ByvgHESqqBWz6RaPgY6842VuAlL0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-atEB43eB8btQfMXPTCfsZ6bbAUIPzF8lUELx0Rdul84=";
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/11happy/cpx/releases/tag/v${finalAttrs.version}";
|
||||
description = "File copy tool for Linux with progress bars, resume capability";
|
||||
homepage = "https://github.com/11happy/cpx";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "cpx";
|
||||
maintainers = with lib.maintainers; [ kyehn ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.41.0";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CfYBAGuny+v7wvJBDCeZVxG+M9LE+eBaq5REjJA2yyw=";
|
||||
hash = "sha256-Ev3Kk+jFnjc8pdozeeqktxDtYjyODvdN8lkiynMKe/o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2rEerdtwNAhQbdqabyyetw30DSpbmIxoiU2YPTWbEcg=";
|
||||
vendorHash = "sha256-u2K0CmCFFrlNVUJhof/8/OtX2ruKvVAIhyyE5Uyoj6Y=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -2,6 +2,10 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitLab,
|
||||
hicolor-icon-theme,
|
||||
kdePackages,
|
||||
papirus-icon-theme,
|
||||
unstableGitUpdater,
|
||||
colorVariants ? [ ], # default: install all icons
|
||||
}:
|
||||
|
||||
@@ -18,15 +22,24 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2024-06-10";
|
||||
version = "0-unstable-2026-02-08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "aiyahm";
|
||||
repo = "FairyWren-Icons";
|
||||
rev = "a86736cc9ff50af0ca59ef31c464da2f9e9da103";
|
||||
hash = "sha256-IzTq45lMdlAt+mEb7gpp1hWKBUSeLWINK53Sv4RithI=";
|
||||
rev = "66295dee92a34c01174ac7fa3ac7d677d60af32e";
|
||||
hash = "sha256-6NK0+pggoezpBhOM+XxrzipT5Pv2vhSlwyEJ0M8WtBM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
hicolor-icon-theme
|
||||
kdePackages.breeze-icons
|
||||
papirus-icon-theme
|
||||
];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/icons
|
||||
@@ -38,11 +51,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "FairyWren Icon Set";
|
||||
homepage = "https://gitlab.com/aiyahm/FairyWren-Icons";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iamanaws ];
|
||||
platforms = lib.platforms.all;
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
lib,
|
||||
flac,
|
||||
lame,
|
||||
opusTools,
|
||||
opus-tools,
|
||||
vorbis-tools,
|
||||
ffmpeg,
|
||||
}:
|
||||
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
flac
|
||||
lame
|
||||
# Optional deps depending on encoding types
|
||||
opusTools
|
||||
opus-tools
|
||||
vorbis-tools
|
||||
ffmpeg
|
||||
]
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
pkg-config,
|
||||
shntool,
|
||||
flac,
|
||||
opusTools,
|
||||
opus-tools,
|
||||
vorbis-tools,
|
||||
mp3gain,
|
||||
lame,
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
bin_path = lib.makeBinPath [
|
||||
shntool
|
||||
flac
|
||||
opusTools
|
||||
opus-tools
|
||||
vorbis-tools
|
||||
mp3gain
|
||||
lame
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "google-lighthouse";
|
||||
version = "13.0.2";
|
||||
version = "13.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleChrome";
|
||||
repo = "lighthouse";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jbyp8RJChX6CjXucQLcvRwkUJWptUer3xNNbwaB8vi4=";
|
||||
hash = "sha256-449UZlEDBUhqZ16aYnZhGHBUt6ox1G/FYvJRav63/wk=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
diff --git a/libs/genesis/lib/genesis/CMakeLists.txt b/libs/genesis/lib/genesis/CMakeLists.txt
|
||||
index 8660c78..caa7618 100644
|
||||
--- a/libs/genesis/lib/genesis/CMakeLists.txt
|
||||
+++ b/libs/genesis/lib/genesis/CMakeLists.txt
|
||||
@@ -66,11 +66,6 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.9.0")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-# Add htslib as a dependency, so that CMake realizes that it has to be built.
|
||||
-IF(GENESIS_USE_HTSLIB)
|
||||
- add_dependencies( genesis_lib_obj htslib )
|
||||
-ENDIF()
|
||||
-
|
||||
# Same for samtools. Not used at the moment though.
|
||||
# IF(GENESIS_USE_SAMTOOLS)
|
||||
# add_dependencies( genesis_lib_obj samtools )
|
||||
@@ -26,20 +26,31 @@ let
|
||||
"--disable-libcurl"
|
||||
"--disable-plugins"
|
||||
];
|
||||
# Patches break the build
|
||||
patches = [ ];
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "grenedalf";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lczech";
|
||||
repo = "grenedalf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DJ7nZjOvYFQlN/L+S2QcMVvH/M9Dhla4VXl2nxc22m4=";
|
||||
hash = "sha256-RD2WYhGBPJuBmbqrjDqujKj/djnxA5ED/LFmhHYIFyE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-genesis-cmake.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required (VERSION 3.5 FATAL_ERROR)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -5,9 +5,10 @@
|
||||
fetchDebianPatch,
|
||||
testers,
|
||||
autoreconfHook,
|
||||
bash,
|
||||
bashNonInteractive,
|
||||
tcl,
|
||||
tk,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -75,14 +76,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash # allow /bin/sh shebang in hfs to get patched during fixupPhase
|
||||
bashNonInteractive # allow /bin/sh shebang in hfs to get patched during fixupPhase
|
||||
tcl
|
||||
tk
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
(lib.strings.withFeatureAs true "tcl" "${tcl}")
|
||||
(lib.strings.withFeatureAs true "tk" "${tk}")
|
||||
(lib.strings.withFeatureAs true "tcl" tcl)
|
||||
(lib.strings.withFeatureAs true "tk" tk)
|
||||
];
|
||||
|
||||
# Tcl code doesn't pass const strings to API
|
||||
@@ -97,6 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook # current volume is tracked in $HOME/.hcwd
|
||||
];
|
||||
|
||||
installCheckPhase =
|
||||
let
|
||||
diskLabel = "Test Disk";
|
||||
@@ -104,9 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
''
|
||||
runHook preInstallCheck
|
||||
|
||||
# current volume is tracked in $HOME/.hcwd
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
# Allow pipeline to fail here
|
||||
set +o pipefail
|
||||
yes | head -c 819200 > disk.hfs
|
||||
|
||||
@@ -63,7 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://codeberg.org/fairyglade/ly";
|
||||
license = lib.licenses.wtfpl;
|
||||
mainProgram = "ly";
|
||||
maintainers = with lib.maintainers; [ yiyu ];
|
||||
maintainers = with lib.maintainers; [
|
||||
zacharyarnaise
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "3.185.1",
|
||||
"version": "3.187.0",
|
||||
"assets": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_linux_x86_64",
|
||||
"hash": "sha256-zDhN3KtvyFdGeZYZRnjKFCDiGSnIezXrBISOq1hR3Yg="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.187.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-3a3xCVn0j4UgV5TIRu95TwEnUdKZX/usWInW6XGPa98="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_linux_aarch64",
|
||||
"hash": "sha256-8Cylh5Pq0uxPLCu1H/JsfxvRgipF3bTOpsbkLL50OXY="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.187.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-3pA3LvHEeg1maRRNoEKkYlbBAn9eXh59EcuxjLpcFTs="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_mac_universal",
|
||||
"hash": "sha256-EUScHFfJpqB9v1qjrMzF+Itfs4rTQzj5XPUDod2xiJU="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.187.0/mirrord_mac_universal",
|
||||
"hash": "sha256-C4lV7fh/BdawZ1P26EcigaJ/v75BSApqu6csEH27uz8="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_mac_universal",
|
||||
"hash": "sha256-EUScHFfJpqB9v1qjrMzF+Itfs4rTQzj5XPUDod2xiJU="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.187.0/mirrord_mac_universal",
|
||||
"hash": "sha256-C4lV7fh/BdawZ1P26EcigaJ/v75BSApqu6csEH27uz8="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+52
-62
@@ -16,13 +16,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-FSMuXVA5q5L5evwos5bIsuT81suO8FbCjEF3OvAL9p0="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.22045.20230930",
|
||||
"hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
|
||||
"version": "2.1.25547.20250602",
|
||||
"hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.AvaloniaEdit",
|
||||
@@ -36,38 +36,33 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "0.0.29",
|
||||
"hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
|
||||
"version": "11.3.2",
|
||||
"hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.DataGrid",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-Ki6O9HYbseQPV3DsvwmJ+ERimi/WmvzelNJDKP6loo0="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-oFivO8/0rir4BwQsTeWs3bSnb7RmldwxYmI77j5pt8k="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-p38+O0VDqZ8u5VOzImP21/U5wyP1BUp2UrLLc9HSfwE="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-UE2/w9cw3YDzsw3HuhI2sTPy8reH9C71ufmHOpzvlSQ="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-vw67lp/oOt+2lqdJ5PK2FY93jqPTcgZqOAXLtSXlJ8s="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
@@ -76,33 +71,33 @@
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-l1f3rVygtI268llwbN0NvTDSfXwZE3CyRw8w5tbHBC4="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-89TGu50JfEVFo+QZgyOR0uOagC/xoJvqfnrHep3W/cc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Fluent",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-tiJ0xAFf0UVSH7LASPtg/7ils7+vZjw2UKBMydyUR3Q="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-AJS5Ls0tJ6PCr2mnr1PpxGWX4sII8mpe2R+VCFYRg44="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-6/NG4OrB/4YisXzJ51GPuq3uDn8oEUWyJRAqejyMCQw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.1.3",
|
||||
"hash": "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="
|
||||
"version": "11.3.11",
|
||||
"hash": "sha256-2fiQvKxU/r71UOAQgy0zwSHVCM2uG2sdEUhObd5TrQQ="
|
||||
},
|
||||
{
|
||||
"pname": "DotUtils.StreamUtils.Sources",
|
||||
@@ -116,28 +111,28 @@
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp",
|
||||
"version": "7.3.0.2",
|
||||
"hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Linux",
|
||||
"version": "7.3.0.2",
|
||||
"hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.macOS",
|
||||
"version": "7.3.0.2",
|
||||
"hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
|
||||
"version": "7.3.0.2",
|
||||
"hash": "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Win32",
|
||||
"version": "7.3.0.2",
|
||||
"hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
|
||||
},
|
||||
{
|
||||
"pname": "MicroCom.Runtime",
|
||||
@@ -206,28 +201,28 @@
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
"version": "2.88.8",
|
||||
"hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Linux",
|
||||
"version": "2.88.8",
|
||||
"hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.macOS",
|
||||
"version": "2.88.8",
|
||||
"hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.WebAssembly",
|
||||
"version": "2.88.8",
|
||||
"hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Win32",
|
||||
"version": "2.88.8",
|
||||
"hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
|
||||
},
|
||||
{
|
||||
"pname": "System.Buffers",
|
||||
@@ -261,19 +256,14 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.6.0",
|
||||
"hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.6.0",
|
||||
@@ -321,7 +311,7 @@
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus.Protocol",
|
||||
"version": "0.16.0",
|
||||
"hash": "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="
|
||||
"version": "0.21.2",
|
||||
"hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
|
||||
}
|
||||
]
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "msbuild-structured-log-viewer";
|
||||
version = "2.3.124";
|
||||
version = "2.3.139";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KirillOsenkov";
|
||||
repo = "MSBuildStructuredLog";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-aAHyCyIVT97STJ8tZTpw/BqQjTRI/GTnEcWpjgkCWgM=";
|
||||
hash = "sha256-5i5qEwUzk9bUn2F/wcMfIOodcfn4d9ApdADes5e1nIo=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "museum";
|
||||
version = "1.3.10";
|
||||
version = "1.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
repo = "ente";
|
||||
sparseCheckout = [ "server" ];
|
||||
tag = "photos-v${finalAttrs.version}";
|
||||
hash = "sha256-x22RzmDHTb6YVB0/+KcaFlX3e/c8vvFR/572MZWNvL8=";
|
||||
hash = "sha256-Wh4jAYMM71PEyjYPaKqJNs2rnBNbf+cR9+dP2ZpnuaU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-napF55nA/9P8l5lddnEHQMjLXWSyTzgblIQCbSZ20MA=";
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
mp3Support ? true,
|
||||
lame,
|
||||
opusSupport ? true,
|
||||
opusTools,
|
||||
opus-tools,
|
||||
faacSupport ? false,
|
||||
faac,
|
||||
flacSupport ? true,
|
||||
@@ -53,7 +53,7 @@ python3Packages.buildPythonApplication {
|
||||
zeroconf
|
||||
]
|
||||
++ lib.optional mp3Support lame
|
||||
++ lib.optional opusSupport opusTools
|
||||
++ lib.optional opusSupport opus-tools
|
||||
++ lib.optional faacSupport faac
|
||||
++ lib.optional flacSupport flac
|
||||
++ lib.optional soxSupport sox
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rustical";
|
||||
version = "0.12.1";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lennart-k";
|
||||
repo = "rustical";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+JWpb0Hi8qyVjnwsxlYAlrqH3GhLqTFj2tbAWFIN+mg=";
|
||||
hash = "sha256-egvvC5XGnf3TeDTk2AwaZV6M6zHurQZ5/jdd19382Tc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TNIAdxOmAgZOGe3aBcKmeEzuGP8LuhGNDMNY/MUwiTw=";
|
||||
cargoHash = "sha256-QbEZuPQI6ZPOT5mUFPou5Q8SQK4ejMBttM4egD1FzdE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "sif";
|
||||
version = "0-unstable-2026-01-11";
|
||||
version = "0-unstable-2026-02-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmfunc";
|
||||
repo = "sif";
|
||||
tag = "automated-release-c988e54";
|
||||
hash = "sha256-/9LRmSrji/8SCD9aHx82HwBfBRPVKzOnogw+uvDI+WI=";
|
||||
rev = "03bfe70cff2249cef6e52679aba3d411916a4dd1";
|
||||
hash = "sha256-tIV9h5kaXq4CKDDexSxiDXcWD2l510qXt5BBxwFV8Nw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ztKXnOjZS/jMxsRjtF0rIZ3lKv4YjMdZd6oQFRuAtR4=";
|
||||
vendorHash = "sha256-kbFNnPf8A4dtTnk/XBArgM6yOE2gbW6mXR5oevkQ6Ms=";
|
||||
|
||||
subPackages = [ "cmd/sif" ];
|
||||
|
||||
@@ -30,7 +30,12 @@ buildGoModule {
|
||||
# network-dependent tests
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version=branch"
|
||||
"--version-regex=(0-unstable-.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Modular pentesting toolkit written in Go";
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sitelen-seli-kiwen";
|
||||
version = "1.8.1";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/kreativekorp/sitelen-seli-kiwen/releases/download/${finalAttrs.version}/sitelenselikiwen.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-FqhUsA+q3ZLfJRMxi47rz3FOWnm1pfXxWnM1c8HQ7NY=";
|
||||
hash = "sha256-Ku4+ETI5nXobavjuOnXPuvLHsH3gGsdHOUdv90afADM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "slint-lsp";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-+DGQB3HByzvRq7l/FmwfqyYzCWOjJ2pC/+M9GkybVLw=";
|
||||
hash = "sha256-WaxvwKtRwUjO0SqODDYXrtU5C10htuXBuTnolYUwl0w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-P2h2lkN7t2OD/CcUgoGeadL+LyaDg1ObSnb7fTtg0Hc=";
|
||||
cargoHash = "sha256-Wat4jcvqHz+hL49UAs5wOGZvRiIdIlOvUndginz2okc=";
|
||||
|
||||
rpathLibs = [
|
||||
fontconfig
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "surfer";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "surfer-project";
|
||||
repo = "surfer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-2ikeG4K1CpyHgAZZfPzEFRXRoEh2PnOIf+8OREO6xug=";
|
||||
hash = "sha256-83UKSD9Z4pT0OXLqIgquuJ8W6+U29ZzWG1SOrAOK9ic=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
libxi
|
||||
];
|
||||
|
||||
cargoHash = "sha256-E+9u7t6bLzORL2HiG4iT5pT4nGftyOgO2/eXHuQK4pQ=";
|
||||
cargoHash = "sha256-UuZpgW8di79mTNpDJ7K12IC5Xa3YX9ex2BYd62pUh1o=";
|
||||
|
||||
# Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318
|
||||
doCheck = false;
|
||||
|
||||
@@ -348,6 +348,17 @@ stdenv.mkDerivation {
|
||||
patch -p1 -d swift -i $TMPDIR/swift-separate-lib.patch
|
||||
|
||||
patch -p1 -d llvm-project/llvm -i ${./patches/llvm-module-cache.patch}
|
||||
for root in llvm-project/llvm swift/stdlib; do
|
||||
patch -p1 -d $root -i ${
|
||||
(fetchpatch {
|
||||
name = "fix-SmallVector-compile-error.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/7e44305041d96b064c197216b931ae3917a34ac1.patch";
|
||||
stripLen = 1;
|
||||
hash = "sha256-1htuzsaPHbYgravGc1vrR8sqpQ/NSQ8PUZeAU8ucCFk=";
|
||||
})
|
||||
}
|
||||
done
|
||||
patch -p2 -d llvm-project/llvm -i ${./patches/llvm-fix-X86MCTargetDesc-compile-error.patch}
|
||||
|
||||
for lldbPatch in ${
|
||||
lib.escapeShellArgs [
|
||||
@@ -363,6 +374,12 @@ stdenv.mkDerivation {
|
||||
stripLen = 1;
|
||||
hash = "sha256-QCGhsL/mi7610ZNb5SqxjRGjwJeK2rwtsFVGeG3PUGc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "LLDB-Add-cstdint-to-AddressableBits-102110.patch";
|
||||
url = "https://github.com/llvm/llvm-project/commit/bb59f04e7e75dcbe39f1bf952304a157f0035314.patch";
|
||||
stripLen = 1;
|
||||
hash = "sha256-+CcmZRxCaozFe1Kuf2HX+kGKuh/PDuoFBEFA/t7tL9A=";
|
||||
})
|
||||
]
|
||||
}; do
|
||||
patch -p1 -d llvm-project/lldb -i $lldbPatch
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
From f03ab75680385b1ea62af3ab15c423a3bc0f3588 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hageboeck <stephan.hageboeck@cern.ch>
|
||||
Date: Mon, 20 Jan 2025 17:52:47 +0100
|
||||
Subject: [PATCH] Add missing include to X86MCTargetDesc.h (#123320)
|
||||
|
||||
In gcc-15, explicit includes of `<cstdint>` are required when fixed-size
|
||||
integers are used. In this file, this include only happened as a side
|
||||
effect of including SmallVector.h
|
||||
|
||||
Although llvm compiles fine, the root-project would benefit from
|
||||
explicitly including it here, so we can backport the patch.
|
||||
|
||||
Maybe interesting for @hahnjo and @vgvassilev
|
||||
|
||||
(cherry picked from commit 7abf44069aec61eee147ca67a6333fc34583b524)
|
||||
---
|
||||
llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
|
||||
index d0530bd4d650..10b59462aebe 100644
|
||||
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
|
||||
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
|
||||
@@ -13,6 +13,7 @@
|
||||
#ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H
|
||||
#define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -21,10 +21,10 @@ patch it to also consider `-idirafter` and `-isystem` as added by cc-wrapper.
|
||||
+ llvm::append_range(includeDirs,
|
||||
+ DriverArgs.getAllArgValues(
|
||||
+ clang::driver::options::OPT_idirafter));
|
||||
+ // Nix adds the C++ stdlib include path using `-isystem`.
|
||||
+ // Nix adds the C++ stdlib include path using `-cxx-isystem`.
|
||||
+ llvm::append_range(includeDirs,
|
||||
+ DriverArgs.getAllArgValues(
|
||||
+ clang::driver::options::OPT_isystem));
|
||||
+ clang::driver::options::OPT_cxx_isystem));
|
||||
|
||||
for (const auto &includeDir : includeDirs) {
|
||||
Path dir(includeDir);
|
||||
|
||||
@@ -259,6 +259,7 @@ let
|
||||
|
||||
patches = [
|
||||
./patches/llbuild-cmake-disable-rpath.patch
|
||||
./patches/llbuild-fix-missing-cstdint.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git a/utils/unittest/googletest/src/gtest-death-test.cc b/utils/unittest/googletest/src/gtest-death-test.cc
|
||||
index ede8378..bdef225 100644
|
||||
--- a/utils/unittest/googletest/src/gtest-death-test.cc
|
||||
+++ b/utils/unittest/googletest/src/gtest-death-test.cc
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "gtest/gtest-death-test.h"
|
||||
|
||||
#include <utility>
|
||||
+#include <cstdint>
|
||||
|
||||
#include "gtest/internal/gtest-port.h"
|
||||
#include "gtest/internal/custom/gtest.h"
|
||||
@@ -188,7 +188,7 @@ addCFlagsToList() {
|
||||
# Pass through using -Xcc, but also convert to Swift -I.
|
||||
# These have slightly different meaning for Clang, but Swift
|
||||
# doesn't have exact equivalents.
|
||||
-isystem | -idirafter)
|
||||
-isystem | -cxx-isystem | -idirafter)
|
||||
i=$((i + 1))
|
||||
list+=("-Xcc" "$val" "-Xcc" "${!i}" "-I" "${!i}")
|
||||
;;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
setuptools,
|
||||
click,
|
||||
requests,
|
||||
@@ -14,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cffconvert";
|
||||
version = "2.0.0-unstable-2024-02-12";
|
||||
version = "2.0.0-unstable-2024-04-19";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citation-file-format";
|
||||
repo = "cffconvert";
|
||||
rev = "5295f87c0e261da61a7b919fc754e3a77edd98a7";
|
||||
hash = "sha256-/2qhWVNylrqPSf1KmuZQahzq+YH860cohVSfJsDm1BE=";
|
||||
rev = "b6045d78aac9e02b039703b030588d54d53262ac";
|
||||
hash = "sha256-zgH9q/Jj/AFoTqi9GJQognngIKtzPvYSWJWVsBdL6xg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -46,6 +47,10 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "cffconvert" ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/citation-file-format/cffconvert/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Command line program to validate and convert CITATION.cff files";
|
||||
|
||||
@@ -447,7 +447,8 @@ let
|
||||
// lib.optionalAttrs (lib.versionAtLeast version "4.5") {
|
||||
redirect_build_objects = false; # Avoid copying build objects to output
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# see postBuild
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.isDarwin && !(editor && withMono)) {
|
||||
generate_bundle = "yes";
|
||||
}
|
||||
);
|
||||
@@ -640,12 +641,19 @@ let
|
||||
]
|
||||
);
|
||||
|
||||
postBuild = lib.optionalString (editor && withMono) ''
|
||||
echo "Generating Glue"
|
||||
bin/${binary} --headless --generate-mono-glue modules/mono/glue
|
||||
echo "Building C#/.NET Assemblies"
|
||||
python modules/mono/build_scripts/build_assemblies.py --godot-output-dir bin --precision=${withPrecision}
|
||||
'';
|
||||
postBuild = lib.optionalString (editor && withMono) (
|
||||
''
|
||||
echo "Generating Glue"
|
||||
bin/${binary} --headless --generate-mono-glue modules/mono/glue
|
||||
echo "Building C#/.NET Assemblies"
|
||||
python modules/mono/build_scripts/build_assemblies.py --godot-output-dir bin --precision=${withPrecision}
|
||||
''
|
||||
# when building the mono editor, we need to build the assemblies
|
||||
# before generating the bundle
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
scons $sconsFlags generate_bundle=yes
|
||||
''
|
||||
);
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -686,7 +694,7 @@ let
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p "$out"/Applications
|
||||
cp -r bin/godot_macos_editor.app "$out"/Applications/Godot.app
|
||||
cp -r bin/godot_macos_editor${lib.optionalString withMono "_mono"}.app "$out"/Applications/GodotMono.app
|
||||
''
|
||||
else
|
||||
let
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
libvorbis,
|
||||
replaceVars,
|
||||
lame,
|
||||
opusTools,
|
||||
opus-tools,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "audiocd-kio";
|
||||
@@ -15,7 +15,7 @@ mkKdeDerivation {
|
||||
patches = [
|
||||
(replaceVars ./encoder-paths.patch {
|
||||
lame = lib.getExe lame;
|
||||
opusenc = "${opusTools}/bin/opusenc";
|
||||
opusenc = "${opus-tools}/bin/opusenc";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -1468,6 +1468,7 @@ mapAliases {
|
||||
opentofu-ls = warnAlias "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
|
||||
opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19
|
||||
opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
|
||||
opusTools = warnAlias "'opusTools' has been renamed to 'opus-tools'" opus-tools; # Added 2026-02-12
|
||||
orogene = throw "'orogene' uses a wasm-specific fork of async-tar that is vulnerable to CVE-2025-62518, which is not supported by its upstream"; # Added 2025-10-24
|
||||
ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20
|
||||
OSCAR = throw "'OSCAR' has been renamed to/replaced by 'oscar'"; # Converted to throw 2025-10-27
|
||||
|
||||
Reference in New Issue
Block a user