<ins> { lib , stdenv , fetchFromGitHub , jetbrains , openjdk17 , openjdk17-bootstrap , git , autoconf , unzip , rsync , debugBuild ? false , withJcef ? true , libXdamage , libXxf86vm , libXrandr , libXi , libXcursor , libXrender , libX11 , libXext , libxcb , nss , nspr , libdrm , mesa , wayland , udev }: assert debugBuild -> withJcef; let arch = { "aarch64-linux" = "aarch64"; "x86_64-linux" = "x64"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); cpu = stdenv.hostPlatform.parsed.cpu.name; in openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; javaVersion = "17.0.11"; build = "1207.24"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime # git reset --hard [revision] # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d "," openjdkTag = "jbr-17.0.8+7"; version = "${javaVersion}-b${build}"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; hash = "sha256-a7cJF2iCW/1GK0/GmVbaY5pYcn3YtZy5ngFkyAGRhu0="; }; BOOT_JDK = openjdk17-bootstrap.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update SOURCE_DATE_EPOCH = 1715809405; patches = [ ]; dontConfigure = true; buildPhase = '' runHook preBuild ${lib.optionalString withJcef "cp -r ${jetbrains.jcef} jcef_linux_${arch}"} sed  -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/"  -e "s/SOURCE_DATE_EPOCH=.*//"  -e "s/export SOURCE_DATE_EPOCH//"  -i jb/project/tools/common/scripts/common.sh sed -i "s/STATIC_CONF_ARGS/STATIC_CONF_ARGS $configureFlags/" jb/project/tools/linux/scripts/mkimages_${arch}.sh sed  -e "s/create_image_bundle "jb/#/"  -e "s/echo Creating /exit 0 #/"  -i jb/project/tools/linux/scripts/mkimages_${arch}.sh patchShebangs . ./jb/project/tools/linux/scripts/mkimages_${arch}.sh ${build} ${if debugBuild then "fd" else (if withJcef then "jcef" else "nomod")} runHook postBuild ''; installPhase = let buildType = if debugBuild then "fastdebug" else "release"; debugSuffix = if debugBuild then "-fastdebug" else ""; jcefSuffix = if debugBuild || !withJcef then "" else "_jcef"; jbrsdkDir = "jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build}"; in '' runHook preInstall mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} rm -rf build/linux-${cpu}-server-${buildType}/images/jdk mv build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} build/linux-${cpu}-server-${buildType}/images/jdk '' + oldAttrs.installPhase + "runHook postInstall"; postInstall = lib.optionalString withJcef '' chmod +x $out/lib/openjdk/lib/chrome-sandbox ''; dontStrip = debugBuild; postFixup = '' # Build the set of output library directories to rpath against LIBDIRS="${lib.makeLibraryPath [ libXdamage libXxf86vm libXrandr libXi libXcursor libXrender libX11 libXext libxcb nss nspr libdrm mesa wayland udev ]}" for output in $outputs; do if [ "$output" = debug ]; then continue; fi LIBDIRS="$(find $(eval echo $$output) -name *.so* -exec dirname {} + | sort -u | tr 'n' ':'):$LIBDIRS" done # Add the local library paths to remove dependencies on the bootstrap for output in $outputs; do if [ "$output" = debug ]; then continue; fi OUTPUTDIR=$(eval echo $$output) BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name *.so*) echo "$BINLIBS" | while read i; do patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true patchelf --shrink-rpath "$i" || true done done ''; nativeBuildInputs = [ git autoconf unzip rsync ] ++ oldAttrs.nativeBuildInputs; meta = with lib; { description = "An OpenJDK fork to better support Jetbrains's products."; longDescription = '' JetBrains Runtime is a runtime environment for running IntelliJ Platform based products on Windows, Mac OS X, and Linux. JetBrains Runtime is based on OpenJDK project with some modifications. These modifications include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI support, ligatures, some fixes for native crashes not presented in official build, and other small enhancements. JetBrains Runtime is not a certified build of OpenJDK. Please, use at your own risk. ''; homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; inherit (openjdk17.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; broken = stdenv.isDarwin; }; passthru = oldAttrs.passthru // { home = "${jetbrains.jdk}/lib/openjdk"; }; }) </ins>


jdk = jdk21; withJcef = false; }; <ins> jdk-no-jcef-17 = callPackage ../development/compilers/jetbrains-jdk/17.nix { withJcef = false; }; </ins> jdk = callPackage ../development/compilers/jetbrains-jdk { jdk = jdk21; };


PRODUCTION = "true"; ALEMBIC_CONFIG_FILE="${pkg}/config/alembic.ini"; API_PORT = toString cfg.port; <del> BASE_URL = "http://localhost:${cfg.port}"; </del> <ins> BASE_URL = "http://localhost:${toString cfg.port}"; </ins> DATA_DIR = "/var/lib/mealie"; CRF_MODEL_PATH = "/var/lib/mealie/model.crfmodel"; } // (builtins.mapAttrs (_: val: toString val) cfg.settings);


}: let <del> version = "1.7.0"; </del> <ins> version = "1.9.0"; </ins> src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; rev = "v${version}"; <del> hash = "sha256-z7kLBDzvzPWY7XmpROMpw3LcDpsl+hA+w1SdhrD/yNU="; </del> <ins> hash = "sha256-gg7ClclBS9j9n4/3HLxbX8HXTz9Zw5+BYG2MEYRsRBU="; </ins> }; frontend = callPackage (import ./mealie-frontend.nix src version) { };


hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc="; }; <ins> postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace setup.py  --replace-fail "-flto" "" ''; </ins> nativeBuildInputs = [ pybind11 ]; # tests are removed from fork


homepage = "https://github.com/searxng/fasttext-predict/"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; <del> # ImportError: dynamic module does not define module export function (PyInit_fasttext_pybind) broken = stdenv.isDarwin; </del> }; }


<ins> { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf , glib, gtk2, harfbuzz, jdk, lib, xorg , libbsd, libjack2, libpng , libxkbcommon , makeWrapper, pixman , xdg_utils, zenity, zlib }: stdenv.mkDerivation rec { name = "bitwig-studio-${version}"; version = "1.3.16"; src = fetchurl { url    = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8"; }; nativeBuildInputs = [ dpkg makeWrapper ]; unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; dontBuild    = true; dontPatchELF = true; dontStrip    = true; libPath = with xorg; lib.makeLibraryPath [ alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm zlib ]; binPath = lib.makeBinPath [ xdg_utils zenity ]; installPhase = '' mkdir -p $out cp -r opt/bitwig-studio $out/libexec # Use NixOS versions of these libs instead of the bundled ones. ( cd $out/libexec/lib/bitwig-studio rm libbz2.so* libxkbfile.so* libXcursor.so* libXau.so*  libXdmcp.so* libpng16.so* libxcb*.so* libharfbuzz.so*  libcairo.so* libfreetype.so* ln -s ${bzip2.out}/lib/libbz2.so.1.0.6 libbz2.so.1.0 ) # Use our OpenJDK instead of Bitwig’s bundled—and commercial!—one. rm -rf $out/libexec/lib/jre ln -s ${jdk.home}/jre $out/libexec/lib/jre # Bitwig’s `libx11-windowing-system.so` has several problems: # #   • has some old version of libxkbcommon linked statically (ಠ_ಠ), # #   • hardcodes path to `/usr/share/X11/xkb`, # #   • even if we redirected it with libredirect (after adding #     `eaccess()` to libredirect!), their version of libxkbcommon #     is unable to parse our xkeyboardconfig. Been there, done that. # # However, it suffices to override theirs with our libxkbcommon # in LD_PRELOAD. :-) find $out -type f -executable  -not -name '*.so.*'  -not -name '*.so'  -not -path '*/resources/*' |  while IFS= read -r f ; do patchelf  --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker)  $f &&  wrapProgram $f  --prefix PATH : "${binPath}"  --prefix LD_LIBRARY_PATH : "${libPath}"  --set LD_PRELOAD "${libxkbcommon.out}/lib/libxkbcommon.so" || true done mkdir -p $out/bin ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio cp -r usr/share $out/share substitute usr/share/applications/bitwig-studio.desktop  $out/share/applications/bitwig-studio.desktop  --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio ''; meta = with stdenv.lib; { description = "A digital audio workstation"; longDescription = '' Bitwig Studio is a multi-platform music-creation system for production, performance and DJing, with a focus on flexible editing tools and a super-fast workflow. ''; homepage = http://www.bitwig.com/; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus mrVanDalo ]; }; } </ins>


<ins> { stdenv, fetchurl, bitwig-studio1, xdg_utils, zenity, ffmpeg }: bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; version = "2.2.2"; src = fetchurl { url    = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; }; buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; binPath = stdenv.lib.makeBinPath [ ffmpeg xdg_utils zenity ]; }) </ins>


<del> { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, ffmpeg, freetype, gdk_pixbuf , glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp , libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb , libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm , xdg_utils, zenity, zlib }: stdenv.mkDerivation rec { name = "bitwig-studio-${version}"; version = "2.2.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; }; nativeBuildInputs = [ dpkg makeWrapper ]; unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; dontBuild = true; dontPatchELF = true; dontStrip = true; libPath = lib.makeLibraryPath [ alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm zlib ]; binPath = lib.makeBinPath [ ffmpeg xdg_utils zenity ]; installPhase = '' mkdir -p $out cp -r opt/bitwig-studio $out/libexec # Use NixOS versions of these libs instead of the bundled ones. ( cd $out/libexec/lib/bitwig-studio rm libbz2.so* libxkbfile.so* libXcursor.so* libXau.so*  libXdmcp.so* libpng16.so* libxcb*.so* libharfbuzz.so*  libcairo.so* libfreetype.so* ln -s ${bzip2.out}/lib/libbz2.so.1.0.6 libbz2.so.1.0 ) # Use our OpenJDK instead of Bitwig’s bundled—and commercial!—one. rm -rf $out/libexec/lib/jre ln -s ${jdk.home}/jre $out/libexec/lib/jre # Bitwig’s `libx11-windowing-system.so` has several problems: # #   • has some old version of libxkbcommon linked statically (ಠ_ಠ), # #   • hardcodes path to `/usr/share/X11/xkb`, # #   • even if we redirected it with libredirect (after adding #     `eaccess()` to libredirect!), their version of libxkbcommon #     is unable to parse our xkeyboardconfig. Been there, done that. # # However, it suffices to override theirs with our libxkbcommon # in LD_PRELOAD. :-) find $out -type f -executable  -not -name '*.so.*'  -not -name '*.so'  -not -path '*/resources/*' |  while IFS= read -r f ; do patchelf  --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker)  $f &&  wrapProgram $f  --prefix PATH : "${binPath}"  --prefix LD_LIBRARY_PATH : "${libPath}"  --set LD_PRELOAD "${libxkbcommon.out}/lib/libxkbcommon.so" || true done mkdir -p $out/bin ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio cp -r usr/share $out/share substitute usr/share/applications/bitwig-studio.desktop  $out/share/applications/bitwig-studio.desktop  --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio ''; meta = with stdenv.lib; { description = "A digital audio workstation"; longDescription = '' Bitwig Studio is a multi-platform music-creation system for production, performance and DJing, with a focus on flexible editing tools and a super-fast workflow. ''; homepage = http://www.bitwig.com/; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus ]; }; } </del>


bitscope = callPackage ../applications/science/electronics/bitscope/packages.nix { }; <del> bitwig-studio =  callPackage ../applications/audio/bitwig-studio { </del> <ins> bitwig-studio1 =  callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { </ins> inherit (gnome2) zenity; }; <ins> bitwig-studio2 =  callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit (gnome2) zenity; inherit (self) bitwig-studio1; }; bitwig-studio = bitwig-studio2; </ins> bgpdump = callPackage ../tools/networking/bgpdump { };


, which , wrapGAppsHook3 , darwin <ins> , vulkan-loader , autoPatchelfHook </ins> }: stdenv.mkDerivation (finalAttrs: {


]; nativeBuildInputs = [ <ins> autoPatchelfHook </ins> pkg-config which wrapGAppsHook3


darwin.apple_sdk_11_0.frameworks.OpenAL ]; <ins> appendRunpaths = [ (lib.makeLibraryPath [ vulkan-loader ]) ]; </ins> enableParallelBuilding = true; makeFlags = lib.optionals stdenv.isLinux [


cdrtools, curl, gawk, <ins> glxinfo, </ins> gnugrep, gnused, jq,


quickemu, testers, installShellFiles, <del> fetchpatch2, </del> }: let runtimePaths = [


qemu socat swtpm <del> usbutils </del> util-linux unzip <del> xdg-user-dirs </del> xrandr zsync <ins> ] ++ lib.optionals stdenv.isLinux [ glxinfo usbutils xdg-user-dirs </ins> ]; in stdenv.mkDerivation (finalAttrs: { pname = "quickemu"; <del> version = "4.9.4-unstable-2024-05-28"; </del> <ins> version = "4.9.5"; </ins> src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; <del> rev = "d78255b097b599e8ab3713cb61c4085cc45f5a95"; # TODO: return to version on next release hash = "sha256-fF306CdGqKM+779OLm0NNyqPBtm7TuU7UN/NanT12y8="; </del> <ins> rev = finalAttrs.version; hash = "sha256-UlpNujF2E8H1zcWTen8D29od60pY8FaGueviT0iwupQ="; </ins> }; postPatch = ''


''; passthru.tests = testers.testVersion { <del> version = "4.9.5"; # required for passing tests, TODO: remove when release bump </del> package = quickemu; }; meta = { description = "Quickly create and run optimised Windows, macOS and Linux virtual machines"; homepage = "https://github.com/quickemu-project/quickemu"; <ins> changelog = "https://github.com/quickemu-project/quickemu/releases/tag/${finalAttrs.version}"; </ins> mainProgram = "quickemu"; license = lib.licenses.mit; maintainers = with lib.maintainers; [


specs-nvim = buildVimPlugin { pname = "specs.nvim"; <del> version = "2022-09-20"; </del> <ins> version = "2024-05-19"; </ins> src = fetchFromGitHub { <del> owner = "edluffy"; </del> <ins> owner = "cxwx"; </ins> repo = "specs.nvim"; <del> rev = "2743e412bbe21c9d73954c403d01e8de7377890d"; sha256 = "1ycqvxrn13bfimf9k03bmm1baml8gyq5lxqjxh1fya44s2bg714r"; </del> <ins> rev = "dd82496f538b688cedf98429f89fef47ecb0625e"; sha256 = "0427fx6iw3i2y9ny3sz1na32bxcj8i93dbm93ckxf3bii8zqjs0s"; </ins> }; <del> meta.homepage = "https://github.com/edluffy/specs.nvim/"; </del> <ins> meta.homepage = "https://github.com/cxwx/specs.nvim/"; </ins> }; spellsitter-nvim = buildVimPlugin {


https://github.com/liuchengxu/space-vim/,, https://github.com/ctjhoa/spacevim/,, https://github.com/chrisgeo/sparkup/,, <del> https://github.com/edluffy/specs.nvim/,, </del> <ins> https://github.com/cxwx/specs.nvim/,HEAD, </ins> https://github.com/lewis6991/spellsitter.nvim/,HEAD, https://github.com/stsewd/sphinx.nvim/,, https://github.com/sjl/splice.vim/,,


stdenv.mkDerivation rec { pname = "uutils-coreutils"; <del> version = "0.0.25"; </del> <ins> version = "0.0.27"; </ins> src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; <del> hash = "sha256-25jmlGxMWzAaJEmMHruA6H+nqx2QHnYX9c9SKqrQRE4="; </del> <ins> hash = "sha256-6MbX3C5NVwiOwXW5xJO2X3qKMh3pUSALR9aK2IbgaaU="; </ins> }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; <del> hash = "sha256-lQoOkiSga2aS8GNgLcHdid1/1u3johYEcGi9oOVsdJs="; </del> <ins> hash = "sha256-JowORfYHxN8GqvWeUm0ACnHNM3uZviYbhR7BOeAfphw="; </ins> }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ];


, pango , pulseaudio , python3 <ins> , stdenv </ins> , util-linux , which , x264 , x265 , xauth <ins> , xdg-utils </ins> , xorg , xorgserver }:


./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159 ]; <ins> # Note: xposix is renamed to posix in v5. postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace xpra/platform/xposix/features.py  --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" ''; </ins> INCLUDE_DIRS = "${pam}/include"; nativeBuildInputs = [


stdenv.mkDerivation rec { pname = "azuredatastudio"; <del> version = "1.44.1"; </del> <ins> version = "1.48.1"; </ins> desktopItems = [ desktopItem urlHandlerDesktopItem ]; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; <del> sha256 = "sha256-6kEV331kt+/7/uWKZmTTkJX4P06CfxC8Ogq052qlUEg="; </del> <ins> sha256 = "sha256-JDNdMy0Wk6v2pMKS+NzSbsrffaEG2IneZO+K9pBFX48="; </ins> }; nativeBuildInputs = [


]; # this will most likely need to be updated when azuredatastudio's version changes <del> sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; </del> <ins> sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.11.1.1"; </ins> rpath = lib.concatStringsSep ":" [ (lib.makeLibraryPath [


githubId = 15379000; name = "schneefux"; }; <ins> schnow265 = { email = "thesnowbox@icloud.com"; github = "schnow265"; githubId = 57457177; name = "Luca Scalet"; }; </ins> schnusch = { github = "schnusch"; githubId = 5104601;


<ins> { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "goread"; version = "1.6.5"; src = fetchFromGitHub { owner = "TypicalAM"; repo = "goread"; rev = "v${version}"; hash = "sha256-SRVXcdgtRpWqvO28CnUcx40nFJnG+Hd94Ezgaj5xK6A="; }; vendorHash = "sha256-/kxEnw8l9S7WNMcPh1x7xqiQ3L61DSn6DCIvJlyrip0="; env.TEST_OFFLINE_ONLY = 1; meta = { description = "Beautiful program to read your RSS/Atom feeds right in the terminal"; homepage = "https://github.com/TypicalAM/goread"; changelog = "https://github.com/TypicalAM/goread/releases/tag/v${version}"; license = lib.licenses.gpl3Plus; mainProgram = "goread"; maintainers = with lib.maintainers; [ schnow265 ]; }; } </ins>


<del> { lib, stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl , python3, python3Packages, zlib, minisat, cryptominisat }: </del> <ins> { lib , stdenv , cmake , boost , bison , flex , fetchFromGitHub , fetchpatch , perl , python3 , zlib , minisat , cryptominisat }: </ins> stdenv.mkDerivation rec { pname = "stp";


src = fetchFromGitHub { owner = "stp"; repo = "stp"; <del> rev    = version; sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87"; </del> <ins> rev = version; hash = "sha256-B+HQF4TJPkYrpodE4qo4JHvlu+a5HTJf1AFyXTnZ4vk="; </ins> }; patches = [ # Fix missing type declaration # due to undeterminisitic compilation # of circularly dependent headers ./stdint.patch <ins> # Python 3.12+ compatibility for build: https://github.com/stp/stp/pull/450 (fetchpatch { url = "https://github.com/stp/stp/commit/fb185479e760b6ff163512cb6c30ac9561aadc0e.patch"; hash = "sha256-guFgeWOrxRrxkU7kMvd5+nmML0rwLYW196m1usE2qiA="; }) </ins> ]; postPatch = ''


sed -e '1i #include <cstdint>' -i include/stp/AST/ASTNode.h ''; <del> buildInputs = [ boost zlib minisat cryptominisat python3 ]; </del> <ins> buildInputs = [ boost zlib minisat cryptominisat python3 ]; </ins> nativeBuildInputs = [ cmake bison flex perl ]; preConfigure = '' <del> python_install_dir=$out/${python3Packages.python.sitePackages} </del> <ins> python_install_dir=$out/${python3.sitePackages} </ins> mkdir -p $python_install_dir cmakeFlagsArray=( $cmakeFlagsArray


meta = with lib; { description = "Simple Theorem Prover"; <del> maintainers = with maintainers; [ McSinyx ]; </del> <ins> maintainers = with maintainers; [ McSinyx numinit ]; </ins> platforms = platforms.linux; license = licenses.mit; };


--replace "#include <assert.h>" "" substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c  --replace "#include <assert.h>" "" <del> '')); </del> <ins> '')) + lib.optionalString (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "14") '' # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.6/libcxx/utils/merge_archives.py # Seems to only be used in v13 though it's present in v12 and v14, and dropped in v15. substituteInPlace ../libcxx/utils/merge_archives.py  --replace-fail "import distutils.spawn" "from shutil import which as find_executable"  --replace-fail "distutils.spawn." "" ''; </ins> # Hack around weird upsream RPATH bug postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) ''


wrapProgram $out/bin/tailscaled  --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]}  --suffix PATH : ${lib.makeBinPath [ procps ]} <ins> sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' </ins> local INSTALL="$out/bin/tailscale" installShellCompletion --cmd tailscale  --bash <($out/bin/tailscale completion bash)  --fish <($out/bin/tailscale completion fish)  --zsh <($out/bin/tailscale completion zsh) <del> sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service </del> ''; passthru.tests = {


<del> { lib, fetchFromGitHub, python3Packages }: </del> <ins> { lib, fetchFromGitHub, python3Packages, gobject-introspection, wrapGAppsNoGuiHook }: </ins> python3Packages.buildPythonPackage rec { pname = "open-fprintd";


sha256 = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; }; <ins> nativeBuildInputs = [ wrapGAppsNoGuiHook gobject-introspection ]; </ins> propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; checkInputs = with python3Packages; [ dbus-python ];


--replace /usr/lib/open-fprintd "$out/lib/open-fprintd" ''; <ins> dontWrapGApps = true; makeWrapperArgs = [ "${gappsWrapperArgs[@]}" ]; </ins> postFixup = '' wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath" '';


<del> { lib , python3 , fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "flexget"; version = "3.11.39"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; hash = "sha256-saNxs+Xdf6OTRRcMTceU8/ITcYzwtP8VqRKxsWyas+o="; }; postPatch = '' # remove dependency constraints but keep environment constraints sed 's/[~<>=][^;]*//' -i requirements.txt ''; build-system = with python3.pkgs; [ setuptools wheel ]; dependencies = with python3.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt apscheduler beautifulsoup4 click colorama commonmark feedparser guessit html5lib jinja2 jsonschema loguru more-itertools packaging pendulum psutil pynzb pyrsistent pyrss2gen python-dateutil pyyaml rebulk requests rich rpyc sqlalchemy typing-extensions # WebUI requirements cherrypy flask-compress flask-cors flask-login flask-restful flask-restx flask pyparsing werkzeug zxcvbn # Plugins requirements transmission-rpc ]; pythonImportsCheck = [ "flexget" "flexget.plugins.clients.transmission" ]; # ~400 failures doCheck = false; meta = with lib; { homepage = "https://flexget.com/"; changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; description = "Multipurpose automation tool for all of your media"; license = licenses.mit; maintainers = with maintainers; [ pbsds ]; }; } </del>


<ins> { lib , python3 , python311 , fetchFromGitHub }: let python = if (builtins.tryEval python3.pkgs.nose.outPath).success then python3 else python311; in python.pkgs.buildPythonApplication rec { pname = "flexget"; version = "3.11.41"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; hash = "sha256-ZSqkD53fdDnKulVPgM9NWXVFXDR0sZ94mRyV1iKS87o="; }; postPatch = '' # remove dependency constraints but keep environment constraints sed 's/[~<>=][^;]*//' -i requirements.txt ''; build-system = with python.pkgs; [ setuptools wheel ]; dependencies = with python.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml apscheduler beautifulsoup4 colorama feedparser guessit html5lib jinja2 jsonschema loguru psutil pynzb pyrss2gen python-dateutil pyyaml rebulk requests rich rpyc sqlalchemy # WebUI requirements cherrypy flask-compress flask-cors flask-login flask-restx flask packaging pyparsing werkzeug zxcvbn pendulum # Plugins requirements transmission-rpc qbittorrent-api deluge-client cloudscraper python-telegram-bot ]; pythonImportsCheck = [ "flexget" "flexget.api.core.authentication" "flexget.api.core.database" "flexget.api.core.plugins" "flexget.api.core.schema" "flexget.api.core.server" "flexget.api.core.tasks" "flexget.api.core.user" "flexget.components.thetvdb.api" "flexget.components.tmdb.api" "flexget.components.trakt.api" "flexget.components.tvmaze.api" "flexget.plugins.clients.aria2" "flexget.plugins.clients.deluge" "flexget.plugins.clients.nzbget" "flexget.plugins.clients.pyload" "flexget.plugins.clients.qbittorrent" "flexget.plugins.clients.rtorrent" "flexget.plugins.clients.transmission" "flexget.plugins.services.kodi_library" "flexget.plugins.services.myepisodes" "flexget.plugins.services.pogcal_acquired" ]; # ~400 failures doCheck = false; meta = with lib; { homepage = "https://flexget.com/"; changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; description = "Multipurpose automation tool for all of your media"; license = licenses.mit; maintainers = with maintainers; [ pbsds ]; }; } </ins>


flamp = callPackage ../applications/radio/flamp { }; <del> flexget = callPackage ../applications/networking/flexget { }; </del> fldigi = callPackage ../applications/radio/fldigi { hamlib = hamlib_4; };


githubId = 4201956; name = "pongo1231"; }; <ins> PopeRigby = { name = "PopeRigby"; github = "poperigby"; githubId = 20866468; }; </ins> poptart = { email = "poptart@hosakacorp.net"; github = "terrorbyte";


<del> { lib, stdenv, fetchFromGitHub, makeWrapper , SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader, moltenvk </del> <ins> { lib, stdenv, fetchFromGitHub, meson, ninja, glslang, pkg-config, flac, libopus, opusfile, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-loader, moltenvk, </ins> }: stdenv.mkDerivation rec { pname = "vkquake"; <del> version = "1.22.3"; </del> <ins> version = "1.31.0"; </ins> src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; <del> sha256 = "sha256-+8DU1QT3Lgqf1AIReVnXQ2Lq6R6eBb8VjdkJfAn/Rtc="; </del> <ins> sha256 = "sha256-3xWwqN0EcwDMEhVxfLa0bMMClM+zELEFWzO/EJvPNs0="; </ins> }; <del> sourceRoot = "${src.name}/Quake"; </del> nativeBuildInputs = [ makeWrapper <del> vulkan-headers </del> <ins> glslang meson ninja pkg-config </ins> ]; buildInputs = [ <del> gzip </del> SDL2 <del> libvorbis </del> <ins> flac gzip </ins> libmad <ins> libopus libvorbis opusfile </ins> vulkan-loader ] ++ lib.optional stdenv.isDarwin moltenvk; buildFlags = [ "DO_USERDIRS=1" ]; <del> preInstall = '' mkdir -p "$out/bin" ''; makeFlags = [ "prefix=$(out) bindir=$(out)/bin" ]; </del> env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; }; <del> postFixup = '' wrapProgram $out/bin/vkquake  --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib </del> <ins> installPhase = '' mkdir -p "$out/bin" cp vkquake "$out/bin" </ins> ''; <del> enableParallelBuilding = true; </del> <ins> postFixup = '' patchelf $out/bin/vkquake  --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; </ins> meta = with lib; { description = "Vulkan Quake port based on QuakeSpasm"; <del> mainProgram = "vkquake"; </del> homepage = src.meta.homepage; longDescription = '' vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering.


''; platforms = with platforms; linux ++ darwin; <del> maintainers = with maintainers; [ ylh ]; </del> <ins> maintainers = with maintainers; [ PopeRigby ylh ]; mainProgram = "vkquake"; </ins> }; }


buildPythonPackage rec { pname = "momepy"; <del> version = "0.7.0"; </del> <ins> version = "0.8.0"; </ins> pyproject = true; disabled = pythonOlder "3.10";


owner = "pysal"; repo = "momepy"; rev = "v${version}"; <del> hash = "sha256-HVp2a0z+5fbfkNSxnTfZPCgG2SJMlKX/zso14M18mCk="; </del> <ins> hash = "sha256-r2iGzk54MsrkYB3Sp9/B1QGKnvqPGUj3MQhk6yqIoXE="; </ins> }; build-system = [ setuptools-scm ];


kpurpose kdeclarative wrapGAppsHook3 <del> glaxnimate </del> ]; # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it


mlt shared-mime-info libv4l <del> glaxnimate </del> ]; qtWrapperArgs = [


haveLibcxx = stdenv.cc.libcxx != null; isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16"; inherit (stdenv.hostPlatform) isMusl isAarch64; <ins> noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic; </ins> baseName = "compiler-rt"; pname = baseName + lib.optionalString (haveLibc) "-libc";


"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" ] ++ lib.optionals (useLLVM && haveLibc) [ "-DCOMPILER_RT_BUILD_SANITIZERS=ON" <del> ] ++ lib.optionals (!haveLibc || bareMetal || isMusl || isDarwinStatic) [ </del> <ins> ] ++ lib.optionals (noSanitizers) [ </ins> "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" ] ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [ "-DCOMPILER_RT_BUILD_XRAY=OFF"


"-DCOMPILER_RT_ENABLE_IOS=OFF" ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ "-DSANITIZER_MIN_OSX_VERSION=10.10" <ins> ]  ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ "-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF" </ins> ]; outputs = [ "out" "dev" ];


} <ins> sub cpuManufacturer { my $id = shift; return $cpuinfo =~ /^vendor_ids*:.* $id$/m; } </ins> # Determine CPU governor to use if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {


push @kernelModules, "kvm-intel" if hasCPUFeature "vmx"; push @kernelModules, "kvm-amd" if hasCPUFeature "svm"; <ins> push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD"; push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel"; </ins> # Look at the PCI devices and add necessary modules.  Note that most # modules are auto-detected so we don't need to list them here.


{ lib <ins> , gccStdenv </ins> , stdenv , fetchurl , fetchpatch


}) # Fix detection of NEON (and armv6 build) : ./fix-neon-detection.patch <del> ]; </del> <ins> ] # CMake files require a bit of patching to support CMAKE_ASM_COMPILER. # Made by @RossComputerGuy for x265 v3.5. # https://mailman.videolan.org/pipermail/x265-devel/2024-July/013734.html ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-clang-asm.patch; </ins> postPatch = '' substituteInPlace cmake/Version.cmake


(mkFlag ppaSupport "ENABLE_PPA") (mkFlag vtuneSupport "ENABLE_VTUNE") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") <del> ]; </del> <ins> ] # Clang does not support the endfunc directive so use GCC. ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"; </ins> cmakeStaticLibFlags = [ "-DHIGH_BIT_DEPTH=ON"


<ins> diff --git a/CMakeLists.txt b/CMakeLists.txt index a407271b4..593628e0f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -310,7 +310,7 @@ if(GCC) endif() check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN) if (CC_HAS_STACK_REALIGN) -        add_definitions(-mstackrealign) +        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-mstackrealign>) endif() # Disable exceptions. Reduce executable size, increase compability. check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG) @@ -545,7 +545,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY) list(APPEND ASM_OBJS ${ASM}.${SUFFIX}) add_custom_command( OUTPUT ${ASM}.${SUFFIX} -                COMMAND ${CMAKE_CXX_COMPILER} +                COMMAND ${CMAKE_ASM_COMPILER} ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX} DEPENDS ${ASM_SRC}) endforeach() diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 12b643ad5..876f3543d 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -16,6 +16,7 @@ endif(EXTRA_LIB) if(ENABLE_ASSEMBLY) set_source_files_properties(threading.cpp primitives.cpp pixel.cpp PROPERTIES COMPILE_FLAGS -DENABLE_ASSEMBLY=1) list(APPEND VFLAGS "-DENABLE_ASSEMBLY=1") +    enable_language(ASM) endif(ENABLE_ASSEMBLY) if(ENABLE_ASSEMBLY AND X86) </ins>


<del> { appimageTools , lib , fetchurl }: let pname = "nuclear"; version = "0.6.30"; src = fetchurl { url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage"; hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop  --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; meta = with lib; { description = "Streaming music player that finds free music for you"; homepage = "https://nuclear.js.org/"; license = licenses.agpl3Plus; maintainers = [ maintainers.NotAShelf ]; platforms = [ "x86_64-linux" ]; mainProgram = "nuclear"; }; } </del>


<ins> { appimageTools, lib, fetchurl, }: let pname = "nuclear"; version = "0.6.31"; src = fetchurl { # Nuclear currenntly only publishes AppImage releases for x86_64, which is hardcoded in # the package name. We also hardcode the host arch in the release name, but should upstream # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose # source URL accordingly. url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; hash = "sha256-ezho69fDP4OiLpC8KNKc8OIZ++TX4GUinFB6o8MLx3I="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop  --replace-fail 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; meta = { description = "Streaming music player that finds free music for you"; homepage = "https://nuclear.js.org/"; license = lib.licenses.agpl3Plus; maintainers = [ lib.maintainers.NotAShelf ]; platforms = [ "x86_64-linux" ]; mainProgram = "nuclear"; }; } </ins>


''; }; <del> nuclear = callPackage ../applications/audio/nuclear { }; </del> nuclei = callPackage ../tools/security/nuclei { }; nullmailer = callPackage ../servers/mail/nullmailer {