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

This commit is contained in:
K900
2025-12-29 10:52:45 +03:00
42 changed files with 167 additions and 258 deletions
+1
View File
@@ -5686,6 +5686,7 @@
github = "0xda157";
githubId = 153149335;
name = "0xda157";
keys = [ { fingerprint = "5A66 FF95 36DE B501 DDD2 1647 B7AC 1B10 365D 45FF"; } ];
};
dabao1955 = {
email = "dabao1955@163.com";
@@ -720,15 +720,6 @@ in
"xen-blkback"
"xen-netback"
"xen-pciback"
"evtchn"
"gntdev"
"netbk"
"blkbk"
"xen-scsibk"
"usbbk"
"pciback"
"xen-acpi-processor"
"blktap2"
"tun"
"netxen_nic"
"xen_wdt"
@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "inkscape";
version = "1.4.2";
version = "1.4.3";
outputs = [
"out"
"man"
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz";
sha256 = "sha256-IABTDHkX5SYMnoV1pxVP9pJmQ9IAZIfXFOMEqWPwx4I=";
sha256 = "sha256-6DosPbVwtsWh/w/M/nCYg3s/a9dLEzVnk3yKkXEO0dE=";
};
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
@@ -101,26 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
# Fix path to ps2pdf binary
inherit ghostscript;
})
(fetchpatch {
name = "fix-build-poppler-25.06.0.patch";
url = "https://gitlab.com/inkscape/inkscape/-/commit/40f5b15b7e29908b79c54e81db6f340936102e08.patch";
hash = "sha256-bYRd/KUh/7qFb7x0EuUgQYA9P8abcTf5XS67gzaAiXA=";
})
(fetchpatch {
name = "fix-build-poppler-25.07.0.patch";
url = "https://gitlab.com/inkscape/inkscape/-/commit/8ae83ca81bbaebcc0ff0abe82300d56d2c94e6f9.patch";
hash = "sha256-s7UMnv1pAiQA/HL5CEdBwCn4v/tsphc0MSnBJAoqolY=";
})
(fetchpatch {
name = "fix-build-poppler-25.09.0.patch";
url = "https://gitlab.com/inkscape/inkscape/-/commit/f48b429827dca510b41a5671d467e574ef348625.patch";
hash = "sha256-9CfmkTGMVHjZiiE3zvi4YOrytcir8a7O2z3PrhjcohI=";
})
(fetchpatch {
name = "fix-build-poppler-25.10.0.patch";
url = "https://gitlab.com/inkscape/inkscape/-/commit/4dba481fe898c6317696d50b109f5aed8f269c19.patch";
hash = "sha256-FFCkMU+Ec2qobG4ru89NPcM9Gxw8ZyFV+6jpW8ZwgE4=";
})
];
postPatch = ''
@@ -2,6 +2,7 @@
lib,
buildGoModule,
buildGo124Module,
buildGo125Module,
fetchFromGitHub,
nixosTests,
installShellFiles,
@@ -40,12 +41,6 @@ let
inherit hash;
};
# Nomad requires Go 1.24.6, but nixpkgs doesn't have it in unstable yet.
postPatch = ''
substituteInPlace go.mod \
--replace-warn "go 1.24.6" "go 1.24.5"
'';
nativeBuildInputs = [ installShellFiles ];
ldflags = [
@@ -88,6 +83,18 @@ rec {
nomad = nomad_1_10;
nomad_1_11 = generic {
buildGoModule = buildGo125Module;
version = "1.11.0";
hash = "sha256-ETC9zJVup/BLivsBWVez5/OLpl7cjdlIRACVK9ga3Io=";
vendorHash = "sha256-WqGWEjaPicpmkARSEQ/bqw8+GSemh1fcM3pb4BGjZpU=";
license = lib.licenses.bsl11;
passthru.tests.nomad = nixosTests.nomad;
preCheck = ''
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
'';
};
nomad_1_10 = generic {
buildGoModule = buildGo124Module;
version = "1.10.5";
@@ -1229,13 +1229,13 @@
"vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
},
"spacelift-io_spacelift": {
"hash": "sha256-leXROTarkEHfDmJVLS7kSU3Z27dCF/BfZwBsnujlB90=",
"hash": "sha256-GSGKjV5tuwTyPvdwd/Z8t9g7LFkkg4gHKhI3FYt00gQ=",
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
"owner": "spacelift-io",
"repo": "terraform-provider-spacelift",
"rev": "v1.40.0",
"rev": "v1.42.0",
"spdx": "MIT",
"vendorHash": "sha256-cX5K221Jnq701Nb+2bC1LmXVL7YvkZ8dkc2wYjDNOSw="
"vendorHash": "sha256-XNPXjqrrTIC3WrpvDBP7veAYgmYws9FdF4W3j6ewRPk="
},
"splunk-terraform_signalfx": {
"hash": "sha256-Wixg+biff6OER/nXYa+WGXG7svs4T3E/qwPlV5xJEao=",
+2 -2
View File
@@ -4,7 +4,7 @@
fetchFromGitea,
yarn-berry_3,
nodejs,
python3,
python311,
pkg-config,
libsass,
xcbuild,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
yarn-berry
nodejs
pkg-config
python3
python311
libsass
]
++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
+11 -1
View File
@@ -1,6 +1,6 @@
{
lib,
beamPackages,
beam_minimal,
fetchFromGitea,
cmake,
file,
@@ -8,6 +8,16 @@
nix-update-script,
}:
let
beamPackages = beam_minimal.packages.erlang_26.extend (
self: super: {
elixir = self.elixir_1_16;
rebar3 = self.rebar3WithPlugins {
plugins = with self; [ pc ];
};
}
);
in
beamPackages.mixRelease rec {
pname = "akkoma";
version = "3.17.0";
+2 -2
View File
@@ -14,7 +14,7 @@
procps,
tree,
which,
fftw,
fftwFloat,
pipewire,
withPipewireLib ? true,
symlinkJoin,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
alsa-lib
ncurses
libsamplerate
fftw
fftwFloat
];
configureFlags = [
+2 -2
View File
@@ -1,6 +1,6 @@
{
lib,
stdenv,
gcc15Stdenv,
cmake,
fetchFromGitHub,
hwdata,
@@ -21,7 +21,7 @@
wayland-protocols,
wayland-scanner,
}:
stdenv.mkDerivation (finalAttrs: {
gcc15Stdenv.mkDerivation (finalAttrs: {
pname = "aquamarine";
version = "0.10.0";
+2 -2
View File
@@ -1,11 +1,11 @@
{
stdenv,
clangStdenv,
lib,
fetchFromGitHub,
cmake,
}:
stdenv.mkDerivation rec {
clangStdenv.mkDerivation rec {
pname = "armips";
version = "0.11.0";
+2 -2
View File
@@ -22,7 +22,7 @@
lcms2,
libraw,
libiptcdata,
fftw,
fftwSinglePrec,
expat,
pcre2,
libsigcxx,
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
lcms2
libraw
libiptcdata
fftw
fftwSinglePrec
expat
pcre2
libsigcxx
+8 -3
View File
@@ -1,6 +1,7 @@
{
lib,
stdenv,
darwin,
fetchFromGitHub,
fetchpatch,
autoreconfHook,
@@ -8,7 +9,11 @@
gitUpdater,
}:
stdenv.mkDerivation (finalAttrs: {
let
# atf is a dependency of libiconv. Avoid an infinite recursion with `pkgsStatic` by using a bootstrap stdenv.
stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
pname = "atf";
version = "0.23";
@@ -26,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail 'atf_test_program{name="srcdir_test"}' ""
''
# These tests fail on Darwin.
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isDarwin) ''
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv'.hostPlatform.isDarwin) ''
substituteInPlace atf-c/detail/process_test.c \
--replace-fail 'ATF_TP_ADD_TC(tp, status_coredump);' ""
''
# This test fails on Linux.
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv.hostPlatform.isLinux) ''
+ lib.optionalString (finalAttrs.doInstallCheck && stdenv'.hostPlatform.isLinux) ''
substituteInPlace atf-c/detail/fs_test.c \
--replace-fail 'ATF_TP_ADD_TC(tp, eaccess);' ""
'';
+5 -1
View File
@@ -25,6 +25,10 @@
cudaPackages,
enableCuda ? config.cudaSupport,
}:
let
opencv' = opencv.override { enableGtk3 = true; };
in
stdenv.mkDerivation {
pname = "basalt-monado";
version = "0-unstable-2025-09-25";
@@ -57,7 +61,7 @@ stdenv.mkDerivation {
libGL
lz4
magic-enum
opencv.cxxdev
opencv'.cxxdev
onetbb
xorg.libX11
]
+7 -5
View File
@@ -13,7 +13,8 @@
buildFHSEnv,
# this package (through the fixpoint glass)
# TODO probably still need for tests at some point
bazel_self,
bazel_7,
bazel_self ? bazel_7,
# native build inputs
runtimeShell,
zip,
@@ -36,10 +37,11 @@
# Apple dependencies
cctools,
libtool,
sigtool,
darwin,
# Allow to independently override the jdks used to build and run respectively
buildJdk,
runJdk,
jdk21_headless,
buildJdk ? jdk21_headless,
runJdk ? jdk21_headless,
# Toggle for hacks for running bazel under buildBazelPackage:
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
@@ -424,7 +426,7 @@ stdenv.mkDerivation rec {
# don't use system installed Xcode to run clang, use Nix clang instead
sed -i -E \
-e "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
-e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \
-e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${darwin.sigtool}/bin/codesign;" \
scripts/bootstrap/compile.sh \
tools/osx/BUILD
+3 -3
View File
@@ -12,7 +12,7 @@
gtk4,
gobject-introspection,
libadwaita,
webkitgtk,
webkitgtk_6_0,
coreutils,
makeShellWrapper,
wrapGAppsHook4,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk4
gobject-introspection
libadwaita
webkitgtk
webkitgtk_6_0
glib-networking
];
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk4.devdoc
glib.devdoc
libadwaita.devdoc
webkitgtk.devdoc
webkitgtk_6_0.devdoc
gobject-introspection.devdoc
]
++ extraDocsPackage;
+12 -12
View File
@@ -67,7 +67,7 @@
pkg-config,
potrace,
pugixml,
python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
python311Packages, # must use python3Packages instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
rocmPackages, # comes with a significantly larger closure size
rubberband,
runCommand,
@@ -95,8 +95,8 @@ let
(!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;
vulkanSupport = !stdenv.hostPlatform.isDarwin;
python3 = python3Packages.python;
pyPkgsOpenusd = python3Packages.openusd.override (old: {
python3 = python311Packages.python;
pyPkgsOpenusd = python311Packages.openusd.override (old: {
opensubdiv = old.opensubdiv.override { inherit cudaSupport; };
withOsl = false;
});
@@ -131,7 +131,7 @@ stdenv'.mkDerivation (finalAttrs: {
substituteInPlace source/creator/CMakeLists.txt \
--replace-fail '${"$"}{LIBDIR}/python' \
'${python3}' \
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
--replace-fail '${"$"}{LIBDIR}/materialx/' '${python311Packages.materialx}/'
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
--replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
'${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
@@ -149,12 +149,12 @@ stdenv'.mkDerivation (finalAttrs: {
cmakeFlags = [
"-C../build_files/cmake/config/blender_release.cmake"
(lib.cmakeFeature "MaterialX_DIR" "${python3Packages.materialx}/lib/cmake/MaterialX")
(lib.cmakeFeature "MaterialX_DIR" "${python311Packages.materialx}/lib/cmake/MaterialX")
(lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
(lib.cmakeFeature "PYTHON_LIBPATH" "${python3}/lib")
(lib.cmakeFeature "PYTHON_LIBRARY" "${python3.libPrefix}")
(lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
(lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python3Packages.numpy_1}/${python3.sitePackages}")
(lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python311Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
(lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python311Packages.numpy_1}/${python3.sitePackages}")
(lib.cmakeFeature "PYTHON_VERSION" "${python3.pythonVersion}")
(lib.cmakeBool "WITH_BUILDINFO" false)
@@ -221,7 +221,7 @@ stdenv'.mkDerivation (finalAttrs: {
cmake
llvmPackages.llvm.dev
makeWrapper
python3Packages.wrapPython
python311Packages.wrapPython
]
++ lib.optionals cudaSupport [
addDriverRunpath
@@ -263,7 +263,7 @@ stdenv'.mkDerivation (finalAttrs: {
potrace
pugixml
python3
python3Packages.materialx
python311Packages.materialx
rubberband
zlib
zstd
@@ -316,7 +316,7 @@ stdenv'.mkDerivation (finalAttrs: {
pythonPath =
let
ps = python3Packages;
ps = python311Packages;
in
[
ps.materialx
@@ -362,13 +362,13 @@ stdenv'.mkDerivation (finalAttrs: {
passthru = {
python = python3;
pythonPackages = python3Packages;
pythonPackages = python311Packages;
withPackages =
f:
(callPackage ./wrapper.nix { }).override {
blender = finalAttrs.finalPackage;
extraModules = (f python3Packages);
extraModules = (f python311Packages);
};
tests = {
+2 -1
View File
@@ -17,7 +17,8 @@
yices, # bsc uses a patched version of yices
zlib,
ghc,
gmp-static,
gmp,
gmp-static ? gmp.override { withStatic = true; },
iverilog,
asciidoctor,
texliveFull,
+2 -2
View File
@@ -25,7 +25,7 @@
withHttpStream ? true,
gst_all_1,
withReplaygain ? true,
ffmpeg,
ffmpeg_6,
speex,
mpg123,
withMtp ? true,
@@ -92,7 +92,7 @@ let
];
enable = withReplaygain;
pkgs = [
ffmpeg
ffmpeg_6
speex
mpg123
];
+2 -2
View File
@@ -1,7 +1,7 @@
{
lib,
fetchFromGitHub,
stdenv,
clangStdenv,
cmake,
pkg-config,
installShellFiles,
@@ -15,7 +15,7 @@
enableLibcxx ? false,
debug ? false,
}:
stdenv.mkDerivation (finalAttrs: {
clangStdenv.mkDerivation (finalAttrs: {
pname = "clang-uml";
version = "0.6.2";
+2 -2
View File
@@ -8,7 +8,7 @@
wrapGAppsHook3,
v2ray-geoip,
v2ray-domain-list-community,
libsoup,
libsoup_3,
}:
let
pname = "clash-verge-rev";
@@ -38,7 +38,7 @@ let
pnpm-hash
vendor-hash
meta
libsoup
libsoup_3
;
};
@@ -23,7 +23,7 @@
kdePackages,
libayatana-appindicator,
libsForQt5,
libsoup,
libsoup_3,
openssl,
webkitgtk_4_1,
}:
@@ -106,7 +106,7 @@ rustPlatform.buildRustPackage {
buildInputs = [
libayatana-appindicator
libsoup
libsoup_3
openssl
webkitgtk_4_1
];
+5 -3
View File
@@ -1,10 +1,12 @@
{
lib,
fetchFromGitHub,
perl,
perlPackages,
perl538Packages,
makeWrapper,
}:
let
perlPackages = perl538Packages;
in
perlPackages.buildPerlPackage {
pname = "cope";
version = "0-unstable-2025-06-20";
@@ -50,7 +52,7 @@ perlPackages.buildPerlPackage {
if [[ -f "$script" && -x "$script" ]]; then
wrapProgram "$script" \
--set PERL5LIB "${perlPath}:$out/lib/perl5/site_perl"
sed -i "1s|^#!.*perl|#!${perl}/bin/perl|" "$out/libexec/.''${script##*/}-wrapped"
sed -i "1s|^#!.*perl|#!${perlPackages.perl}/bin/perl|" "$out/libexec/.''${script##*/}-wrapped"
fi
done
rm -r $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto
+2 -2
View File
@@ -12,7 +12,7 @@
fftw,
libint,
libvori,
libxc,
libxc_7,
dftd4,
simple-dftd3,
tblite,
@@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
gsl
libint
libvori
libxc
libxc_7
libxsmm
mpi
spglib
+3 -3
View File
@@ -8,15 +8,15 @@
let
pname = "everest";
version = "6064";
version = "6088";
phome = "$out/lib/Celeste";
in
stdenvNoCC.mkDerivation {
inherit pname version;
src = fetchzip {
url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6064.0/main.zip";
url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6088.0/main.zip";
extension = "zip";
hash = "sha256-9NFaQNxy+2XCLr7JloxaobsNGCwJ8BLXrI5gq+8KOi0=";
hash = "sha256-npcjx7KOCe8T4MyK1d8Z485+XlvkMgjJ5m0PN5TbpgU=";
};
buildInputs = [
icu
+2 -17
View File
@@ -26,8 +26,8 @@
},
{
"pname": "KeraLua",
"version": "1.3.2",
"hash": "sha256-15C9K/S9L3yzB4wmDRNWQoWNskUVcm6qZjCbQQFGMPI="
"version": "1.4.7",
"hash": "sha256-Hr8Cs+dwmDU7ZdtLaSmAvsZ+EN3zwuazb6EjUam/cCc="
},
{
"pname": "MAB.DotIgnore",
@@ -64,11 +64,6 @@
"version": "7.0.20",
"hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="
},
{
"pname": "Microsoft.Build.Tasks.Git",
"version": "1.1.0",
"hash": "sha256-cwZU5VeF6aRZJqoIevJtF9hdYC1rKEf1GuqgCmoVAzE="
},
{
"pname": "Microsoft.Build.Tasks.Git",
"version": "8.0.0",
@@ -194,21 +189,11 @@
"version": "1.0.3",
"hash": "sha256-vVIonl+4dlCQuxibOZoGR3o1DAhjAYpFW15dnkUpjMk="
},
{
"pname": "Microsoft.SourceLink.Common",
"version": "1.1.0",
"hash": "sha256-bVbHHr6Mo1NUdaaQgfj1GvGPzrobRlYb2pI7f4VDslk="
},
{
"pname": "Microsoft.SourceLink.Common",
"version": "8.0.0",
"hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="
},
{
"pname": "Microsoft.SourceLink.GitHub",
"version": "1.1.0",
"hash": "sha256-Y5zUGJfiSj8/rQ1lK0t5Zje8rjoUhgbWrR8IpwtzB34="
},
{
"pname": "Microsoft.SourceLink.GitHub",
"version": "8.0.0",
+3 -3
View File
@@ -11,7 +11,7 @@
let
pname = "everest";
version = "6064";
version = "6088";
phome = "$out/lib/Celeste";
in
buildDotnetModule {
@@ -20,11 +20,11 @@ buildDotnetModule {
src = fetchFromGitHub {
owner = "EverestAPI";
repo = "Everest";
rev = "b5257c4a51642ca0cdda7b0e4b7287e9d1fb45e3";
rev = "d7bc4c2716b747d243fa4347b98422766b3d8b5a";
fetchSubmodules = true;
# TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
# Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
hash = "sha256-aGZ0n9iBg5gnNEtZCWxhdEeIdmmKJuzuQBpdlc7P6QE=";
hash = "sha256-aCeqEqSxpLZjO8xskjcBjrKOFFGun1TxK88P2VO6BEg=";
};
nativeBuildInputs = [ autoPatchelfHook ];
+1 -1
View File
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
mainProgram = "fasmg";
homepage = "https://flatassembler.net";
license = lib.licenses.bsd3;
maintainers = [ ];
maintainers = [ lib.maintainers.iamanaws ];
platforms = with lib.platforms; lib.intersectLists (linux ++ darwin) x86;
};
}
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "newt";
version = "1.7.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "fosrl";
repo = "newt";
tag = version;
hash = "sha256-R6X9DOu1iGS/a4d5kmKoBZI0L5k7S0w3SHHFQnQH/ho=";
hash = "sha256-ndgigIk/3/cPZaJHfxWh6XvtAJe3S57sEwNTMBH0lSE=";
};
vendorHash = "sha256-5Xr6mwPtsqEliKeKv2rhhp6JC7u3coP4nnhIxGMqccU=";
+6 -5
View File
@@ -20,13 +20,14 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "freetube";
version = "0.23.12";
version = "0.23.12-unstable-2025-12-13";
src = fetchFromGitHub {
owner = "FreeTubeApp";
repo = "FreeTube";
tag = "v${finalAttrs.version}-beta";
hash = "sha256-DH5uT3dPDFZnFYoiMjxpNouNDRbWDctVqvDwHpUlnkY=";
# tag = "v${finalAttrs.version}-beta";
rev = "6717114de5653b08caec20b7bf3f3217723866a4";
hash = "sha256-PfK4Ny8MyBJ9Xw6ozJUzu+4rX+/rLWNac3lE8dBNPE0=";
};
# Darwin requires writable Electron dist
@@ -38,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
''
else
''
ln -s ${electron.dist} electron-dist
ln -s ${electron.dist} source/electron-dist
'';
patches = [
@@ -49,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-sM9CkDnATSEUf/uuUyT4JuRmjzwa1WzIyNYEw69MPtU=";
hash = "sha256-at/Kq7M8qSjlDmB6R4z51VRZRvkKAGyjU6sgHho8tBQ=";
};
nativeBuildInputs = [
@@ -1,13 +1,13 @@
diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
index 5b79d961..9f5945d2 100644
--- a/_scripts/ebuilder.config.js
+++ b/_scripts/ebuilder.config.js
@@ -1,6 +1,8 @@
const { name, productName } = require('../package.json')
diff --git a/_scripts/ebuilder.config.mjs b/_scripts/ebuilder.config.mjs
index 55e72b227..d218f5ac4 100644
--- a/_scripts/ebuilder.config.mjs
+++ b/_scripts/ebuilder.config.mjs
@@ -2,6 +2,8 @@ import packageDetails from '../package.json' with { type: 'json' }
const config = {
/** @type {import('electron-builder').Configuration} */
export default {
+ electronVersion: "@electron-version@",
+ electronDist: "electron-dist",
appId: `io.freetubeapp.${name}`,
copyright: 'Copyleft © 2020-2024 freetubeapp@protonmail.com',
appId: `io.freetubeapp.${packageDetails.name}`,
copyright: 'Copyleft © 2020-2025 freetubeapp@protonmail.com',
// asar: false,
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jack-link";
version = "0.2.5";
version = "0.2.6";
src = fetchFromGitHub {
owner = "rncbc";
repo = "jack_link";
tag = "v${finalAttrs.version}";
hash = "sha256-UYyVGc9/NOLzFD/31zB9lhUJW8G/PGt7VkSBjntpymw=";
hash = "sha256-mZ74nkiAQHkJAZYHTsNcQnrisaUIyHwEDUbrvOL6CAU=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -47,14 +47,14 @@ in
# as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation (finalAttrs: {
pname = "limine";
version = "10.5.1";
version = "10.6.0";
# We don't use the Git source but the release tarball, as the source has a
# `./bootstrap` script performing network access to download resources.
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
hash = "sha256-sD41QQJ3zGDHinynlj5lpZoOPVPyutMCLDnNZNmttHI=";
hash = "sha256-rNLPfDHYVGOzO7pnv7w+l8kevmKPFFJ3O5MtPN6YlG4=";
};
enableParallelBuilding = true;
+9 -9
View File
@@ -1,21 +1,21 @@
{
"version": "3.178.0",
"version": "3.179.0",
"assets": {
"x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_linux_x86_64",
"hash": "sha256-UFG/N5qNuBuBnmD6FDJk3Ly+zKGaUtOEO+7H82VFeFc="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_x86_64",
"hash": "sha256-VStFqwOut1VnspK7963VvR5tnEEmASiWxHj8riiPUCg="
},
"aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_linux_aarch64",
"hash": "sha256-/K9VoCHacmPZuv0ycvt9GPrDG/xDPlq6AP3zAO0Lmlo="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_aarch64",
"hash": "sha256-mK+b3oCCZ098MMYQtRoXo1BuAlxz+4rtdB7EN1vDO38="
},
"aarch64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_mac_universal",
"hash": "sha256-l3ho45nkazyk8byirvq5J0ZMmrqcMasUMUYBj88bh24="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal",
"hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM="
},
"x86_64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_mac_universal",
"hash": "sha256-l3ho45nkazyk8byirvq5J0ZMmrqcMasUMUYBj88bh24="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal",
"hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM="
}
}
}
@@ -10,7 +10,7 @@
let
jre = jre_headless;
version = "7.17.0";
version = "7.18.0";
mainProgram = "openapi-generator-cli";
this = maven.buildMavenPackage {
inherit version;
@@ -21,10 +21,10 @@ let
owner = "OpenAPITools";
repo = "openapi-generator";
tag = "v${version}";
hash = "sha256-9jO+u08wrxW0RcXTGDh8mpPp9Eu2PwRifKNsso6s3QM=";
hash = "sha256-D7F4fbgXqUMH0ZOsnGtB3gVWmans0MPdD7ix6ImXsfA=";
};
mvnHash = "sha256-PiLpJponpJUXakdno+KGxzDvZG6jYRPp3t5q/G5JX+M=";
mvnHash = "sha256-17siKb+TIYAuY1p7+1mcc3QY+Rfnsoy+CJiWT5LFM0w=";
mvnParameters = "-Duser.home=$TMPDIR";
doCheck = false;
+18 -24
View File
@@ -36,13 +36,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "openvscode-server";
version = "1.103.1";
version = "1.106.3";
src = fetchFromGitHub {
owner = "gitpod-io";
repo = "openvscode-server";
rev = "openvscode-server-v${finalAttrs.version}";
hash = "sha256-Co0MF8Yr60Ppv6Zv85nJeua2S5Rnye6wGB1hTWNpMm4=";
hash = "sha256-wcmk35oqJ6d5MR9YnqC/pR0pC03/vCFCd9KLRByQWqk=";
};
## fetchNpmDeps doesn't correctly process git dependencies
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) src nativeBuildInputs;
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-xK4qfzkWuOsEyP1+6cY5Dhrr5wNW3eOJBTyQaE6gTcc=";
outputHash = "sha256-FnlzXlhu72G9dUnezzc62qH2TG5mU9EJNe9akWtR6zg=";
env = {
FORCE_EMPTY_CACHE = true;
FORCE_GIT_DEPS = true;
@@ -69,10 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
mkdir $out
for p in $(find -name package-lock.json)
do (
${prefetch-npm-deps}/bin/prefetch-npm-deps "$p" "$out"
local lockpath=$out/lockfiles/$p
mkdir -p "$(dirname $lockpath)"
mv $out/package-lock.json "$lockpath"
echo "Prefetching $p"
${prefetch-npm-deps}/bin/prefetch-npm-deps "$p" "$out/$(dirname $p)"
)
done
'';
@@ -89,9 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
NIX_NODEJS_BUILDNPMPACKAGE = "1";
npm_config_nodedir = nodejs;
npm_config_node_gyp = "${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js";
# use local npm cache (see <nixpkgs/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh>)
npm_config_cache = finalAttrs.nodeModules;
npm_config_offline = true;
npm_config_progress = false;
@@ -145,12 +140,9 @@ stdenv.mkDerivation (finalAttrs: {
preConfigure = ''
export HOME=$TMPDIR/home
mkdir -p $HOME
mkdir -p $TMPDIR/cache/_cacache
# ln -s $nodeModules/_cacache/* $TMPDIR/cache/_cacache
# mkdir -p $TMPDIR/cache
cp -R $nodeModules/_cacache $TMPDIR/cache
mkdir -p $TMPDIR
cp -R $nodeModules $TMPDIR/cache
chmod -R +w $TMPDIR/cache
export npm_config_cache=$TMPDIR/cache
'';
configurePhase = ''
@@ -167,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: {
echo >&2 "File exists $p/node_modules"
exit 0
fi
npm ci --ignore-scripts
npm_config_cache=$TMPDIR/cache/$p npm ci --ignore-scripts
patchShebangs node_modules
)
done
@@ -186,13 +178,10 @@ stdenv.mkDerivation (finalAttrs: {
''
## node-pty build fix
+ ''
substituteInPlace remote/node_modules/node-pty/scripts/post-install.js \
--replace-fail "npx node-gyp" "$npm_config_node_gyp"
''
## rebuild native binaries
+ ''
echo >&2 "Rebuilding from source in ./remote"
npm --offline --prefix ./remote rebuild --build-from-source
find -path node_modules/node-pty/scripts/gen-compile-commands.js \
-exec substituteInPlace {} \
--replace-fail "npx node-gyp" "$npm_config_node_gyp" \
\;
''
## run postinstall scripts
+ ''
@@ -200,11 +189,16 @@ stdenv.mkDerivation (finalAttrs: {
if jq -e ".scripts.postinstall" {} >-
then
echo >&2 "Running postinstall script in $(dirname {})"
npm --offline --prefix=$(dirname {}) run postinstall
npm --prefix=$(dirname {}) run postinstall
fi
exit 0
' \;
''
## rebuild native binaries
+ ''
echo >&2 "Rebuilding from source in ./remote"
npm --prefix ./remote rebuild --build-from-source
''
+ ''
runHook postConfigure
'';
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "resterm";
version = "0.12.0";
version = "0.13.2";
src = fetchFromGitHub {
owner = "unkn0wn-root";
repo = "resterm";
tag = "v${finalAttrs.version}";
sha256 = "sha256-fqCJXWmmvgGpdJ+mAP2rizQUX3gQdN6rYW5dqkvWFns=";
sha256 = "sha256-CA1+Sa9fqeTaz37FCJGErShinMP6cSNoCtuifdyLUpk=";
};
vendorHash = "sha256-Kj60MkxqRYORANalbJnjgtHMDgxOUOeaF1opqcYnVww=";
+3 -3
View File
@@ -26,14 +26,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
version = "11.7-unstable-2025-12-19";
version = "11.7-unstable-2025-12-27";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
rev = "7fb6a59b5150e6146c6d3df3bb9e9cba7ae449bc";
hash = "sha256-nZMvdlaVyI2zH0r8yrZn1ESN+7/Wk2D+OWujzPahnZU=";
rev = "3cccb2a354966fc4b7e30182b1b0956a8a84523c";
hash = "sha256-uLo/DvTfOU615wMm/Qgp89wdqTeSlAt0Vqv99fUPwjw=";
};
buildInputs =
+3 -3
View File
@@ -36,20 +36,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "siyuan";
version = "3.5.0";
version = "3.5.1";
src = fetchFromGitHub {
owner = "siyuan-note";
repo = "siyuan";
rev = "v${finalAttrs.version}";
hash = "sha256-h7oYlxz9Loh4HiZDeQdWV9ycWfCaNNifgFLo1d5zOJk=";
hash = "sha256-7fKvSK3gatEdIHAZuOzL6LdzLz4k97G+ZKpQh39yhbs=";
};
kernel = buildGoModule {
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.src.name}/kernel";
vendorHash = "sha256-Q6Bpcgav9ClM+d723jYmuunybEP5iHt9nF5ssQ1kokQ=";
vendorHash = "sha256-SqPegOTdjd8HrnXNIRUMAbDhKKrFR+xWZUuqblrZ10c=";
patches = [
(replaceVars ./set-pandoc-path.patch {
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "ticker";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = "ticker";
tag = "v${version}";
hash = "sha256-/W/BZzrIkz/3F2jzQGJ79UycrdEBVTMF+YncCS5TibE=";
hash = "sha256-GH+2as3aK462cTguGekbB4HchVzC1HdBsXwJHwAh47Q=";
};
vendorHash = "sha256-EKc9QRDSOD4WetCXORjMUlaFqh0+B3Aa3m5SR1WiKN4=";
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "zsh-you-should-use";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "MichaelAquilina";
repo = "zsh-you-should-use";
tag = finalAttrs.version;
hash = "sha256-dG6E6cOKu2ZvtkwxMXx/op3rbevT1QSOQTgw//7GmSk=";
hash = "sha256-u3abhv9ewq3m4QsnsxT017xdlPm3dYq5dqHNmQhhcpI=";
};
strictDeps = true;
@@ -33,6 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
meta = {
homepage = "https://github.com/MichaelAquilina/zsh-you-should-use";
changelog = "https://github.com/MichaelAquilina/zsh-you-should-use/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.gpl3;
description = "ZSH plugin that reminds you to use existing aliases for commands you just typed";
maintainers = with lib.maintainers; [ tomodachi94 ];
+1 -1
View File
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
homepage = "https://flatassembler.net/download.php";
license = lib.licenses.bsd2;
mainProgram = "fasm";
maintainers = [ ];
maintainers = [ lib.maintainers.iamanaws ];
platforms = [
"i686-linux"
"x86_64-linux"
+1 -76
View File
@@ -277,10 +277,6 @@ with pkgs;
cve = with python3Packages; toPythonApplication cvelib;
basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {
opencv = opencv.override { enableGtk3 = true; };
};
bloodhound-py = with python3Packages; toPythonApplication bloodhound-py;
# Zip file format only allows times after year 1980, which makes e.g. Python
@@ -323,10 +319,6 @@ with pkgs;
chef-cli = callPackage ../tools/misc/chef-cli { };
clang-uml = callPackage ../by-name/cl/clang-uml/package.nix {
stdenv = clangStdenv;
};
coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });
cup-docker-noserver = cup-docker.override { withServer = false; };
@@ -969,21 +961,6 @@ with pkgs;
opnplug = adlplug.override { type = "OPN"; };
akkoma = callPackage ../by-name/ak/akkoma/package.nix {
beamPackages = beam_minimal.packages.erlang_26.extend (
self: super: {
elixir = self.elixir_1_16;
rebar3 = self.rebar3WithPlugins {
plugins = with self; [ pc ];
};
}
);
};
akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix {
python3 = python311;
};
aegisub = callPackage ../by-name/ae/aegisub/package.nix (
{
luajit = luajit.override { enable52Compat = true; };
@@ -1963,10 +1940,6 @@ with pkgs;
cairo = cairo.override { xcbSupport = true; };
};
aquamarine = callPackage ../by-name/aq/aquamarine/package.nix {
stdenv = gcc15Stdenv;
};
hyprshade = python3Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
hyprlandPlugins = recurseIntoAttrs (
@@ -3342,6 +3315,7 @@ with pkgs;
nomad
nomad_1_9
nomad_1_10
nomad_1_11
;
nth = with python3Packages; toPythonApplication name-that-hash;
@@ -4163,19 +4137,11 @@ with pkgs;
adaptivecppWithCuda = adaptivecpp.override { cudaSupport = true; };
adaptivecppWithRocm = adaptivecpp.override { rocmSupport = true; };
armips = callPackage ../by-name/ar/armips/package.nix {
stdenv = clangStdenv;
};
binaryen = callPackage ../development/compilers/binaryen {
nodejs = nodejs-slim;
inherit (python3Packages) filecheck;
};
bluespec = callPackage ../by-name/bl/bluespec/package.nix {
gmp-static = gmp.override { withStatic = true; };
};
codon = callPackage ../development/compilers/codon {
inherit (llvmPackages) lld stdenv;
};
@@ -5939,13 +5905,6 @@ with pkgs;
bazel = bazel_7;
bazel_7 = callPackage ../by-name/ba/bazel_7/package.nix {
inherit (darwin) sigtool;
buildJdk = jdk21_headless;
runJdk = jdk21_headless;
bazel_self = bazel_7;
};
buildifier = bazel-buildtools;
buildozer = bazel-buildtools;
unused_deps = bazel-buildtools;
@@ -8548,12 +8507,6 @@ with pkgs;
### DEVELOPMENT / TESTING TOOLS
atf = callPackage ../by-name/at/atf/package.nix {
stdenv =
# atf is a dependency of libiconv. Avoid an infinite recursion with `pkgsStatic` by using a bootstrap stdenv.
if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
};
### DEVELOPMENT / LIBRARIES / AGDA
agdaPackages = recurseIntoAttrs (
@@ -9553,10 +9506,6 @@ with pkgs;
alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
alsa-utils = callPackage ../by-name/al/alsa-utils/package.nix {
fftw = fftwFloat;
};
arm-trusted-firmware = callPackage ../misc/arm-trusted-firmware { };
inherit (arm-trusted-firmware)
buildArmTrustedFirmware
@@ -10416,10 +10365,6 @@ with pkgs;
pinentry = pinentry-curses;
};
blender = callPackage ../by-name/bl/blender/package.nix {
python3Packages = python311Packages;
};
blender-hip = blender.override { hipSupport = true; };
blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix {
@@ -12616,10 +12561,6 @@ with pkgs;
anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { };
ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });
art = callPackage ../by-name/ar/art/package.nix {
fftw = fftwSinglePrec;
};
arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { };
beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix {
@@ -13095,10 +13036,6 @@ with pkgs;
siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; };
cp2k = callPackage ../by-name/cp/cp2k/package.nix {
libxc = pkgs.libxc_7;
};
### SCIENCE/BIOLOGY
cd-hit = callPackage ../applications/science/biology/cd-hit {
@@ -14115,26 +14052,14 @@ with pkgs;
fltk = fltk13;
};
cantata = callPackage ../by-name/ca/cantata/package.nix {
ffmpeg = ffmpeg_6;
};
libkazv = callPackage ../by-name/li/libkazv/package.nix {
libcpr = libcpr_1_10_5;
};
biblioteca = callPackage ../by-name/bi/biblioteca/package.nix {
webkitgtk = webkitgtk_6_0;
};
libpostalWithData = callPackage ../by-name/li/libpostal/package.nix {
withData = true;
};
clash-verge-rev = callPackage ../by-name/cl/clash-verge-rev/package.nix {
libsoup = libsoup_3;
};
gpac-unstable = callPackage ../by-name/gp/gpac/package.nix {
releaseChannel = "unstable";
};