}; config = mkIf cfg.enable { <del> networking.firewall.extraCommands = '' ${pkgs.bash}/bin/bash -x ${pkgs.miniupnpd}/etc/miniupnpd/iptables_init.sh -i ${cfg.externalInterface} ''; </del> <ins> networking.firewall.extraCommands = lib.mkIf (firewallScripts != []) (builtins.concatStringsSep "n" (map (fw: '' EXTIF=${cfg.externalInterface} ${pkgs.bash}/bin/bash -x ${miniupnpd}/etc/miniupnpd/${fw}_init.sh '') firewallScripts)); networking.firewall.extraStopCommands = lib.mkIf (firewallScripts != []) (builtins.concatStringsSep "n" (map (fw: '' EXTIF=${cfg.externalInterface} ${pkgs.bash}/bin/bash -x ${miniupnpd}/etc/miniupnpd/${fw}_removeall.sh '') firewallScripts)); </ins> <del> networking.firewall.extraStopCommands = '' ${pkgs.bash}/bin/bash -x ${pkgs.miniupnpd}/etc/miniupnpd/iptables_removeall.sh -i ${cfg.externalInterface} ''; </del> <ins> networking.nftables = lib.mkIf (firewall == "nftables") { # see nft_init in ${miniupnpd-nftables}/etc/miniupnpd tables.miniupnpd = { family = "inet"; # The following is omitted because it's expected that the firewall is to be responsible for it. # # chain forward { #   type filter hook forward priority filter; policy drop; #   jump miniupnpd # } # # Otherwise, it quickly gets ugly with (potentially) two forward chains with "policy drop". # This means the chain "miniupnpd" never actually gets triggered and is simply there to satisfy # miniupnpd. If you're doing it yourself (without networking.firewall), the easiest way to get # it to work is adding a rule "ct status dnat accept" - this is what networking.firewall does. # If you don't want to simply accept forwarding for all "ct status dnat" packets, override # upnp_table_name with whatever your table is, create a chain "miniupnpd" in your table and # jump into it from your forward chain. content = '' chain miniupnpd {} chain prerouting_miniupnpd { type nat hook prerouting priority dstnat; policy accept; } chain postrouting_miniupnpd { type nat hook postrouting priority srcnat; policy accept; } ''; }; }; </ins> systemd.services.miniupnpd = { description = "MiniUPnP daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { <del> ExecStart = "${pkgs.miniupnpd}/bin/miniupnpd -f ${configFile}"; </del> <ins> ExecStart = "${miniupnpd}/bin/miniupnpd -f ${configFile}"; </ins> PIDFile = "/run/miniupnpd.pid"; Type = "forking"; };


stdenv.mkDerivation rec { pname = "tiramisu"; <del> version = "2.0.20211107"; </del> <ins> # FIXME: once a newer release in upstream is available version = "2.0-unstable-2023-03-29"; </ins> src = fetchFromGitHub { owner = "Sweets"; <del> repo = pname; rev = version; sha256 = "1n1x1ybbwbanibw7b90k7v4cadagl41li17hz2l8s2sapacvq3mw"; </del> <ins> repo = "tiramisu"; # FIXME: use the current HEAD commit as upstream has no releases since 2021 rev = "5dddd83abd695bfa15640047a97a08ff0a8d9f9b"; hash = "sha256-owYk/YFwJbqO6/dbGKPE8SnmmH4KvH+o6uWptqQtpfI="; </ins> }; buildInputs = [ glib ];


''; }; <del> extraConfig = mkOption { type = types.lines; default = ""; </del> <ins> settings = mkOption { type = ini.type; default = {}; </ins> description = '' <del> Configuration appended to the generated NetworkManager.conf. </del> <ins> Configuration added to the generated NetworkManager.conf, note that you can overwrite settings with this. </ins> Refer to [ https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html


, autoPatchelfHook , alsa-lib , cups <ins> , libpulseaudio </ins> , libX11 , libXScrnSaver , libXtst


buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; wafConfigureFlags = [ <del> "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" </del> <ins> "--boost-includes=${boost175.dev}/include" "--boost-libs=${boost175.out}/lib" </ins> "--with-tests" ] ++ lib.optional (!withWebSocket) "--without-websocket";


# stray test failure doCheck = false; <ins> nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; </ins> buildInputs = [ ArchiveZip ArchiveCpio file ]; perlPostHook = ''


<del> { lib, stdenv, fetchurl, afl, python2, zlib, pkg-config, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: let cpuTarget = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux-user" else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user" else throw "afl: no support for ${stdenv.hostPlatform.system}!"; in stdenv.mkDerivation rec { pname = "afl-qemu"; version = "2.10.0"; srcs = [ (fetchurl { url = "https://download.qemu.org/qemu-${version}.tar.bz2"; sha256 = "0j3dfxzrzdp1w21k21fjvmakzc6lcha1rsclaicwqvbf63hkk7vy"; }) afl.src ]; sourceRoot = "qemu-${version}"; postUnpack = '' cp ${afl.src.name}/types.h $sourceRoot/afl-types.h substitute ${afl.src.name}/config.h $sourceRoot/afl-config.h  --replace "types.h" "afl-types.h" substitute ${afl.src.name}/qemu_mode/patches/afl-qemu-cpu-inl.h $sourceRoot/afl-qemu-cpu-inl.h  --replace "../../config.h" "afl-config.h" substituteInPlace ${afl.src.name}/qemu_mode/patches/cpu-exec.diff  --replace "../patches/afl-qemu-cpu-inl.h" "afl-qemu-cpu-inl.h" ''; nativeBuildInputs = [ python2 perl pkg-config flex bison autoconf texinfo ]; buildInputs = [ zlib glib pixman libuuid ]; enableParallelBuilding = true; patches = [ # patches extracted from afl source "../${afl.src.name}/qemu_mode/patches/cpu-exec.diff" "../${afl.src.name}/qemu_mode/patches/elfload.diff" "../${afl.src.name}/qemu_mode/patches/syscall.diff" "../${afl.src.name}/qemu_mode/patches/configure.diff" "../${afl.src.name}/qemu_mode/patches/memfd.diff" # nix-specific patches to make installation more well-behaved ./qemu-patches/no-etc-install.patch # patch for fixing qemu build on glibc >= 2.30 ./qemu-patches/syscall-glibc2_30.diff ]; configureFlags = [ "--disable-system" "--enable-linux-user" "--disable-gtk" "--disable-sdl" "--disable-vnc" "--disable-kvm" "--target-list=${cpuTarget}" "--enable-pie" "--sysconfdir=/etc" "--localstatedir=/var" ]; meta = with lib; { homepage = "https://www.qemu.org/"; description = "Fork of QEMU with AFL instrumentation support"; license = licenses.gpl2Plus; maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.linux; }; } </del>


{ stdenv, lib, fetchurl, fetchpatch <del> , zlib, xz, python, ncurses, findXMLCatalogs </del> <ins> , zlib, xz, python, gettext, ncurses, findXMLCatalogs </ins> , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null , enableShared ? stdenv.hostPlatform.libc != "msvcrt"


++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ++ optional withOpenssl "--with-openssl" <ins> ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" </ins> ++ optional stdenv.hostPlatform.isSunOS "ac_cv_func_inotify_init=no" ++ optional withPrefix "--program-prefix=g" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc == "glibc") [


let suffixedVariables = flip mapAttrs cfg.profileRelativeSessionVariables (envVar: suffixes: <del> flip concatMap pamProfiles (profile: </del> <ins> flip concatMap cfg.profiles (profile: </ins> map (suffix: "${profile}${suffix}") suffixes ) ); <ins> # We're trying to use the same syntax for PAM variables and env variables. # That means we need to map the env variables that people might use to their # equivalent PAM variable. # Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have # different syntax. replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["${HOME}" "@{PAM_USER}"]; </ins> pamVariable = n: v: <del> ''${n}   DEFAULT="${concatStringsSep ":" (toList v)}"''; </del> <ins> ''${n}   DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"''; </ins> pamVariables = concatStringsSep "n"


<ins> { pkgs, stdenv, lib, testers, mongosh }: let nodePackages = import ./gen/composition.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }; in nodePackages.mongosh.override { passthru.tests.version = testers.testVersion { package = mongosh; }; meta = with lib; { homepage = "https://www.mongodb.com/try/download/shell"; description = "The MongoDB Shell"; maintainers = with maintainers; [ aaronjheng ]; license = licenses.asl20; mainProgram = "mongosh"; }; } </ins>


openjdk_headless = openjdk8_headless; jdk8 = openjdk8; <ins> jdk8_headless = openjdk8_headless; </ins> jre8 = openjdk8.jre; jre8_headless = openjdk8_headless.jre;


group = "root"; source = "${cfg.packageOverriden}/libexec/${cfg.packageOverriden.projectName}/bin/starter-suid.orig"; }; <del> systemd.tmpfiles.rules = [ </del> <ins> systemd.tmpfiles.rules = mkIf cfg.enableExternalLocalStateDir [ </ins> "d /var/lib/${cfg.packageOverriden.projectName}/mnt/session 0770 root root -" <del> "d /var/lib/${cfg.packageOverriden.projectName}/mnt/final 0770 root root -" "d /var/lib/${cfg.packageOverriden.projectName}/mnt/overlay 0770 root root -" "d /var/lib/${cfg.packageOverriden.projectName}/mnt/container 0770 root root -" "d /var/lib/${cfg.packageOverriden.projectName}/mnt/source 0770 root root -" </del> ]; };


client = { enable = mkEnableOption "Ceph client configuration"; extraConfig = mkOption { <del> type = with types; attrsOf str; </del> <ins> type = with types; attrsOf (attrsOf str); </ins> default = {}; example = '' {


vte_290 = callPackage ./core/vte/2.90.nix { }; <ins> vte-ng = callPackage ./core/vte/ng.nix { }; </ins> vino = callPackage ./core/vino { }; yelp = callPackage ./core/yelp { };


lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks <del> stdenvNoCC.mkDerivation rec { </del> <ins> stdenvNoCC.mkDerivation (finalAttrs: { </ins> inherit pname; <del> version = "2023-06-20"; </del> <ins> version = "2024-04-28"; </ins> src = fetchFromGitHub { owner = "vinceliuice"; <del> repo = pname; rev = version; hash = "sha256-hUXlzLdcWeOHEJx3+vCMpxvJst6Rr8ISvlzlsUgCrhg="; </del> <ins> repo = "fluent-gtk-theme"; rev = finalAttrs.version; hash = "sha256-0zf3fHtWcrbT26jgwgsPEDDhBWErOkgXyvGwSWV8rGs="; </ins> }; nativeBuildInputs = [


<ins> #!@PYTHON@ import json import os import re import shlex import sqlite3 import subprocess import sys DB_PATH = os.path.join(os.environ['HOME'], '.config/Signal/sql/db.sqlite') DB_COPY = os.path.join(os.environ['HOME'], '.config/Signal/sql/db.tmp') CONFIG_PATH = os.path.join(os.environ['HOME'], '.config/Signal/config.json') def zenity_askyesno(title, text): args = [ '@ZENITY@', '--question', '--title', shlex.quote(title), '--text', shlex.quote(text) ] return subprocess.run(args).returncode == 0 def start_signal(): os.execvp('@SIGNAL-DESKTOP@', ['@SIGNAL-DESKTOP@'] + sys.argv[1:]) def copy_pragma(name): result = subprocess.run([ '@SQLCIPHER@', DB_PATH, f"PRAGMA {name};" ], check=True, capture_output=True).stdout result = re.search(r'[0-9]+', result.decode()).group(0) subprocess.run([ '@SQLCIPHER@', DB_COPY, f"PRAGMA key = "x'{key}'"; PRAGMA {name} = {result};" ], check=True, capture_output=True) try: # Test if DB is encrypted: con = sqlite3.connect(f'file:{DB_PATH}?mode=ro', uri=True) cursor = con.cursor() cursor.execute("SELECT name FROM sqlite_master WHERE type='table';") con.close() except: # DB is encrypted, everything ok: start_signal() # DB is unencrypted! answer = zenity_askyesno( "Error: Signal-Desktop database is not encrypted", "Should we try to fix this automatically?" + "You likely want to backup ~/.config/Signal/ first." ) if not answer: answer = zenity_askyesno( "Launch Signal-Desktop", "DB is unencrypted, should we still launch Signal-Desktop?" + "Warning: This could result in data loss!" ) if not answer: print('Aborted') sys.exit(0) start_signal() # Re-encrypt the DB: with open(CONFIG_PATH) as json_file: key = json.load(json_file)['key'] result = subprocess.run([ '@SQLCIPHER@', DB_PATH, f" ATTACH DATABASE '{DB_COPY}' AS signal_db KEY "x'{key}'";" + " SELECT sqlcipher_export('signal_db');" + " DETACH DATABASE signal_db;" ]).returncode if result != 0: print('DB encryption failed') sys.exit(1) # Need to copy user_version and schema_version manually: copy_pragma('user_version') copy_pragma('schema_version') os.rename(DB_COPY, DB_PATH) start_signal() </ins>


meta = { description = "IBM ThinkPad hardware functions driver"; <del> homepage = "https://github.com/evgeni/tp_smapi"; </del> <ins> homepage = "https://github.com/linux-thinkpad/tp_smapi"; </ins> license = lib.licenses.gpl2; maintainers = [ ]; # driver is only ment for linux thinkpads i think  bellow platforms should cover it.


<ins> diff --git a/Cargo.lock b/Cargo.lock index c0dfa2a..2decf88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1158,9 +1158,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" [[package]] name = "gtk4" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396" +checksum = "4e8ae5aef2793bc3551b5e5e3fa062a5de54bb1eccf10dfa4effe9e4384fbbbc" dependencies = [ "bitflags", "cairo-rs", @@ -1181,9 +1181,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7" +checksum = "d9a4a8077b3a392dd7d637924529e1213d2e0c8e4d531177bc3355e86c257a54" dependencies = [ "anyhow", "proc-macro-crate 1.2.1", </ins>


vte = gnome2.vte.override { pythonSupport = true; }; }; <del> termite = callPackage ../applications/misc/termite { vte = null; }; </del> <ins> termite = callPackage ../applications/misc/termite { vte = gnome3.vte-ng; }; </ins> tesseract = callPackage ../applications/graphics/tesseract { };


"-Dfftw3=OFF" "-Dfitsio=OFF" "-Dfortran=OFF" <ins> "-Dimt=OFF" </ins> "-Dgfal=OFF" "-Dgviz=OFF" "-Dhdfs=OFF"


<ins> { stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome3, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "yaru"; version = "19.10.2"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; sha256 = "1azyn8pr0kpbq4wlz91f5amqyxqq0x2mxkglzl488sf39fl0gnbj"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; buildInputs = [ gtk3 gnome3.gnome-themes-extra ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; postPatch = "patchShebangs ."; meta = with stdenv.lib; { description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10"; homepage = https://github.com/ubuntu/yaru; license = with licenses; [ cc-by-sa-40 gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.jD91mZM2 ]; }; } </ins>


maintainers = with maintainers; [ ttuegel lnl7 ]; license = licenses.bsd3; }; <del> } // (if withQt5 then { dontWrapQtApps = true; } else {}) ) </del> <ins> } </ins>


"test_skip_maintenance" ]; <ins> postInstall =  '' installShellCompletion --cmd pipx  --bash <(${argcomplete}/bin/register-python-argcomplete pipx --shell bash)  --zsh <(${argcomplete}/bin/register-python-argcomplete pipx --shell zsh)  --fish <(${argcomplete}/bin/register-python-argcomplete pipx --shell fish) ''; </ins> meta = with lib; { description = "Install and run Python applications in isolated environments"; mainProgram = "pipx";


meta = with lib; { description = "A Mixed Integer Linear Programming (MILP) solver"; <del> homepage    = "http://lpsolve.sourceforge.net"; license     = licenses.gpl2Plus; </del> <ins> homepage = "http://lpsolve.sourceforge.net"; license = licenses.gpl2Plus; </ins> maintainers = with maintainers; [ smironov ]; <del> platforms   = platforms.unix; </del> <ins> platforms = platforms.unix; </ins> }; }


<del> { autoPatchelfHook, fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "julia-bin"; version = "1.7.3"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; sha256 = "0ff7ypr76xf99h3dmy1xdnkq2xn432qnzihxs72xrd4j5nhlybwv"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); # Julia’s source files are in different locations for source and binary # releases. Thus we temporarily create a symlink to allow us to share patches # with source releases. prePatch = '' ln -s share/julia/test ''; patches = [ # Source release Nix patch(es) relevant for binary releases as well. ./patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch ]; postPatch = '' # Revert symlink hack. rm test # Julia fails to pick up our Certification Authority root certificates, but # it provides its own so we can simply disable the test. Patching in the # dynamic path to ours require us to rebuild the Julia system image. substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl  --replace '@test ca_roots_path() != bundled_ca_roots()'  '@test_skip ca_roots_path() != bundled_ca_roots()' ''; nativeBuildInputs = [ autoPatchelfHook ]; installPhase = '' runHook preInstall cp -r . $out runHook postInstall ''; # Breaks backtraces, etc. dontStrip = true; doInstallCheck = true; preInstallCheck = '' # Some tests require read/write access to $HOME. export HOME="$TMPDIR" ''; installCheckPhase = '' runHook preInstallCheck # Command lifted from `test/Makefile`. $out/bin/julia  --check-bounds=yes  --startup-file=no  --depwarn=error  $out/share/julia/test/runtests.jl runHook postInstallCheck ''; meta = { description = "High-level, high-performance, dynamic language for technical computing"; homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ninjin raskin ]; platforms = [ "x86_64-linux" ]; mainProgram = "julia"; }; } </del>


, mobile-broadband-provider-info , runtimeShell , buildPackages <ins> , nixosTests </ins> }: let


buildDotnetModule rec { pname = "osu-lazer"; <del> version = "2024.312.0"; </del> <ins> version = "2024.312.1"; </ins> src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; <del> hash = "sha256-54georjON2Fu/kj4w4SeW0BR/aHomGrKeicJ9N4/Y9s="; </del> <ins> hash = "sha256-7xxuVcBtC79EiDz+/x0IqbPofpgwMdz87XjRLqkCBb8="; </ins> }; projectFile = "osu.Desktop/osu.Desktop.csproj";


hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc="; }; <del> appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: { </del> <ins> appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: { </ins> buildCommand = '' ${oA.buildCommand}


<ins> { lib, buildPythonPackage, fetchFromGitHub, setuptools-scm, pytubefix, requests, devgoldyutils, }: buildPythonPackage rec { pname = "mov-cli-test"; version = "1.1.7"; format = "pyproject"; src = fetchFromGitHub { owner = "mov-cli"; repo = "mov-cli-test"; rev = "refs/tags/${version}"; hash = "sha256-INdPAJxPxfo5bKg4Xn1r7bildxznXrTJxmDI21wylnI="; }; doCheck = false; propagatedBuildInputs = [ pytubefix requests devgoldyutils ]; nativeBuildInputs = [ setuptools-scm ]; meta = { description = "A mov-cli plugin that let's you test mov-cli's capabilities by watching free films and animations in the creative commons"; homepage = "https://github.com/mov-cli/mov-cli-test"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ roshaen ]; }; } </ins>


pytestCheckHook ]; <ins> # Disables tests when running with cuda due to https://github.com/NixOS/nixpkgs/issues/225912 doCheck = !config.cudaSupport; </ins> meta = with lib; { license = licenses.mit; homepage = "https://github.com/ageitgey/face_recognition";


flix = callPackage ../development/compilers/flix { }; <ins> fleng = callPackage ../development/compilers/fleng { }; </ins> fsrx = callPackage ../tools/misc/fsrx { }; fsuae = callPackage ../applications/emulators/fs-uae { };


echo >&2 "" exit 1 ''; <ins> }; </ins> } '' mkdir -p $out/bin cat <<EOF >$out/bin/${name}


wants = [ "network-online.target" ]; after = [ "network-online.target" ]; environment = { <del> STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; </del> <ins> STRONGSWAN_CONF = strongswanConf { inherit setup connections ca managePlugins enabledPlugins; secretsFile = "/etc/ipsec.secrets"; }; </ins> }; serviceConfig = { ExecStart  = "${pkgs.strongswan}/sbin/ipsec start --nofork";


clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; <del> clang_34 = wrapCC llvmPackages_34.clang; </del> <ins> clang_34 = (wrapCC llvmPackages_34.clang).override { # Default cc-wrapper's hardening flags don't work with clang-3.4, # so just remove it entirely for this wrapper. extraBuildCommands = '' :> $out/nix-support/add-hardening.sh ''; }; </ins> clang-tools = callPackage ../development/tools/clang-tools { };


version = "0.2.0"; sha256  = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz"; }; <ins> wavefront = { owner   = "spaceapegames"; repo    = "terraform-provider-wavefront"; version = "2.1.0"; sha256  = "1ir2wkg5mfng7h5544kar1arkjb5ffjhki5qr25a5x0rpwlg99sx"; }; </ins> }


sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; }; <del> buildInputs = [ gtk3 ibus libhangul python3 ]; </del> <ins> patches = [ (substituteAll { src = ./fix-paths.patch; libhangul = "${libhangul}/lib/libhangul.so.1"; }) ]; </ins> <del> nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; </del> <ins> nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython wrapGAppsHook ]; </ins> <del> postFixup = "wrapPythonPrograms"; </del> <ins> buildInputs = [ gtk3 ibus libhangul (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 (toPythonModule ibus) ])) ]; </ins> meta = with stdenv.lib; { isIbusEngine = true; <del> description  = "Ibus Hangul engine"; homepage     = https://github.com/choehwanjin/ibus-hangul; license      = licenses.gpl2; platforms    = platforms.linux; maintainers  = with maintainers; [ ericsagnes ]; </del> <ins> description = "Ibus Hangul engine"; homepage = https://github.com/choehwanjin/ibus-hangul; license = licenses.gpl2; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; </ins> }; }


config = mkIf config.services.pcscd.enable { environment.etc."reader.conf".source = cfgFile; <del> environment.systemPackages = [ package.out ]; systemd.packages = [ (getBin package) ]; </del> <ins> environment.systemPackages = [ package ]; systemd.packages = [ package ]; </ins> services.pcscd.plugins = [ pkgs.ccid ];


owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia <del> rev = "m119-0.67.3"; sha256 = "sha256-U75NuJnQa5+SNlOrsBmdlvflGdjo3el63EeIsbnE7ms="; </del> <ins> rev = "m124-0.72.3"; sha256 = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s="; </ins> }; # The externals for skia are taken from skia/DEPS externals = linkFarm "skia-externals" (lib.mapAttrsToList


inherit (lib) mkOption mkIf singleton; <del> inherit (pkgs) heimdal; </del> <ins> inherit (pkgs) heimdalFull; </ins> stateDir = "/var/heimdal"; in


zktree = callPackage ../applications/misc/zktree {}; <ins> zrythm = callPackage ../applications/audio/zrythm { inherit (plasma5Packages) breeze-icons; }; </ins> zthrottle = callPackage ../tools/misc/zthrottle { }; }


--data-dir $STATE_DIRECTORY  --download-dir $STATE_DIRECTORY  --uri ${options.uri}  <ins> --device ${options.device}  </ins> --model ${options.model}  --language ${options.language}  --beam-size ${options.beamSize} ${options.extraArgs}


{ "darwin": { <del> "hash": "sha256-oIRZtj1BZWioO1ucEXnJQoz/FfDNHWLdYLExuLk+aJk=", "version": "0.2024.04.23.08.01.stable_03" </del> <ins> "hash": "sha256-Ky5JyocpI9JKvhmmhk0Cg/Eo7icmo6FQAT639cGIGrA=", "version": "0.2024.05.07.08.02.stable_02" </ins> }, "linux": { <del> "hash": "sha256-R9//eoelQkH8OAhoU0ux+o1EpQozWhRJwCTTSY9LBGU=", "version": "0.2024.04.23.08.01.stable_03" </del> <ins> "hash": "sha256-zUbWNgiupBoFWoN3I726FejGtGne9dctaiGlPBbj5KU=", "version": "0.2024.05.07.08.02.stable_02" </ins> } }


makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}" <ins> --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libX11 ]}" --prefix WEBKIT_DISABLE_COMPOSITING_MODE : "1" </ins> ) '';


sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754"; }; <del> outputs = [ "bin" "lib" "dev" "out" "man" "dnsutils" "host" ]; </del> <ins> outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; </ins> patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;


postFixup = '' # Fix include path that will be incorrect due to the "dev" output substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets.cmake"  <del> --replace "''${_IMPORT_PREFIX}/include" "$dev/include" </del> <ins> --replace-fail "''${_IMPORT_PREFIX}/include" "$dev/include" </ins> ''; meta = with lib; {


# Wait for network and miniupnpd. router.wait_for_unit("network-online.target") # $router.wait_for_unit("nat") <del> router.wait_for_unit("firewall.service") </del> <ins> router.wait_for_unit("${if useNftables then "nftables" else "firewall"}.service") </ins> router.wait_for_unit("miniupnpd") client1.wait_for_unit("network-online.target")


bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; <del> version = "3.1.0"; </del> <ins> version = "3.1.1"; </ins> src = fetchurl { <del> url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz"; sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b"; </del> <ins> url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; </ins> }; dependencies = [ (sources."argparse-1.0.4" // {


<del> { lib, fetchPypi, nixosTests, python3 }: </del> <ins> { lib, fetchPypi, nixosTests, python3, }: </ins> python3.pkgs.buildPythonApplication rec { version = "0.5.0b3.dev85";


{ stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl8821ce-${kernel.version}-${version}"; <del> version = "5.2.5_1.26055.20180108"; </del> <ins> version = "5.5.2_34066.20200325"; </ins> src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; <del> rev = "ab6154e150bbc7d12b0525d4cc1298ae196e45de"; sha256 = "1my0hidqnv4s7hi5897m81pq0sjw05np0g27hlkg9fwb83b5kzsg"; </del> <ins> rev = "69765eb288a8dfad3b055b906760b53e02ab1dea"; sha256 = "17jiw25k74kv5lnvgycvj2g1n06hbrpjz6p4znk4a62g136rhn4s"; </ins> }; hardeningDisable = [ "pic" ];


, ibus , qtbase , zstd <ins> , fetchpatch </ins> , withFcitx5Support ? false , withIbusSupport ? false }:


# Darwin , gmp , libiconv <ins> , qemu </ins> , Carbon , AppKit


copy_bin_and_libs () { [ -f "$out/bin/$(basename $1)" ] && rm "$out/bin/$(basename $1)" <del> cp -pdv $1 $out/bin </del> <ins> cp -pdvH $1 $out/bin </ins> } # Copy BusyBox.


}; testScript = '' <ins> from base64 import b64encode from urllib.parse import quote </ins> machine.start() machine.wait_for_open_port(80) machine.wait_for_unit("multi-user.target")


<del> { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: </del> <ins> { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: </ins> stdenv.mkDerivation rec { name = "efl-${version}"; <del> version = "1.11.3"; </del> <ins> version = "1.12.2"; </ins> src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; <del> sha256 = "0s9pm3lfp7f2yf877xywjw8ihgr2yrns3gibak0gcwx7d8bfljfr"; </del> <ins> sha256 = "1knxm4xiqxpvpszhyqik43lw36hdwdfh8z7y62803a7093j3yjnw"; </ins> }; <del> buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ] ++ [ xlibs.libXrender xlibs.libXfixes xlibs.libXrandr xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-wayland" "--enable-xine" "--enable-fb" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" ]; </del> <ins> buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old" ]; </ins> NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ];


githubId = 9959940; name = "Andreas Fehn"; }; <ins> felbinger = { name = "Nico Felbinger"; email = "nico@felbinger.eu"; matrix = "@nico:felbinger.eu"; github = "felbinger"; githubId = 26925347; keys = [{ fingerprint = "0797 D238 9769 CA1E 57B7 2ED9 2BA7 8116 87C9 0DE4"; }]; }; </ins> felipeqq2 = { name = "Felipe Silva"; email = "nixpkgs@felipeqq2.rocks";


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 {


, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext , perl, perlPackages, python2Packages, pkgconfig , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr <del> , cairo, pixman, xorg, clisp, biber, xxHash </del> <ins> , brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash </ins> , makeWrapper, shortenPerlShebang }:


bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; <del> version = "3.1.0"; </del> <ins> version = "3.1.1"; </ins> src = fetchurl { <del> url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.0.tgz"; sha1 = "f18a46335854ff9c5b4fe78f88309d7bf0631a1b"; </del> <ins> url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; </ins> }; dependencies = [ sources."argparse-1.0.4"


buildPythonPackage rec { pname = "localstack-ext"; <del> version = "3.2.0"; pyproject = true; </del> <ins> version = "2.3.2"; format = "setuptools"; </ins> src = fetchPypi { inherit pname version; <del> hash = "sha256-53pbt7kNaYQRsLb+OI8gLwR3cBE18ZKLZmG4aP1/93E="; </del> <ins> hash = "sha256-Ex5ZPlteDaiyex90QumucVdTTbpp9uWiBrvw1kMr++8="; </ins> }; postPatch = ''


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


, installShellFiles , git , unzip <del> , dmd_bin ? "${callPackage ./bootstrap.nix { }}/bin" </del> <ins> , dmdBootstrap ? callPackage ./bootstrap.nix { } , dmd_bin ? "${dmdBootstrap}/bin" </ins> }: let


<del> { stdenv, fetchurl, intltool, pkgconfig , gtk3, ibus, libhangul, python3 </del> <ins> { stdenv , fetchurl , substituteAll , intltool , pkgconfig , wrapGAppsHook , gtk3 , ibus , libhangul , python3 </ins> }: stdenv.mkDerivation rec {


# https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests # Retry the API query this many times <del> retryCount=3 </del> <ins> retryCount=5 </ins> # Start with 5 seconds, but double every retry retryInterval=5 while true; do


NIX_LDFLAGS = "-lgcc_s"; configureFlags = [ <del> "--disable-kernel_crypto" </del> "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] ++ stdenv.lib.optional enablePython "--enable-python";


<ins> { lib, nodejs_20, buildNpmPackage, fetchFromGitHub, writeShellScriptBin, nss, cmake, pkg-config, openssl, libdatachannel, }: let nodejs = nodejs_20; buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; version = "1.19.0"; src = fetchFromGitHub { owner = "httptoolkit"; repo = "httptoolkit-server"; rev = "refs/tags/v${version}"; hash = "sha256-S4Io4X5Hlvm/5HoKIQ/OTor9jZvMz6me5RyfZ8FwOdM="; }; overridesNodeModules = buildNpmPackage' { pname = "httptoolkit-server-overrides-node-modules"; inherit version src; sourceRoot = "${src.name}/overrides/js"; npmDepsHash = "sha256-GRN6ua3FY1AE61bB7PM2wgbKPZI/zJeXa5HOOh/2N2Y="; dontBuild = true; installPhase = '' mkdir -p $out cp -r node_modules $out/node_modules ''; }; nodeDatachannel = buildNpmPackage' { pname = "node-datachannel"; version = "0.4.3"; src = fetchFromGitHub { owner = "murat-dogan"; repo = "node-datachannel"; rev = "refs/tags/v${nodeDatachannel.version}"; hash = "sha256-BlfeocqSG+pqbK0onnCf0VKbQw8Qq4qMxhAcfGlFYR8="; }; npmFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; npmDepsHash = "sha256-pgcOOjiuWKlpD+WJyPj/c9ZhDjYuEnybpLS/BPmzeFM="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl libdatachannel ]; dontUseCmakeConfigure = true; env.NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node"; env.CXXFLAGS = "-include stdexcept"; # for GCC13 preBuild = '' # don't use static libs and don't use FetchContent substituteInPlace CMakeLists.txt  --replace-fail 'OPENSSL_USE_STATIC_LIBS TRUE' 'OPENSSL_USE_STATIC_LIBS FALSE'  --replace-fail 'if(NOT libdatachannel)' 'if(false)'  --replace-fail 'datachannel-static' 'datachannel' # don't fetch node headers substituteInPlace node_modules/cmake-js/lib/dist.js  --replace-fail '!this.downloaded' 'false' npm rebuild --verbose ''; installPhase = '' runHook preInstall install -Dm755 build/Release/*.node -t $out/build/Release runHook postInstall ''; }; in buildNpmPackage' { pname = "httptoolkit-server"; inherit version src; patches = [ ./only-build-for-one-platform.patch ]; npmDepsHash = "sha256-njSNdpo+CIfS9LTnshawJ7297tFc8ssjUqJcHk8kBZE="; npmFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; nativeBuildInputs = [ # the build system uses the `git` executable to get the current revision # we use a fake git to provide it with a fake revision (writeShellScriptBin "git" "echo '???'") ]; postConfigure = '' # make sure `oclif-dev' doesn't fetch `node` binary to bundle with the app substituteInPlace node_modules/@oclif/dev-cli/lib/tarballs/node.js --replace-fail  'async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {'  'async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) { return;' # manually place our prebuilt `node-datachannel` binary into its place, since we used '--ignore-scripts' ln -s ${nodeDatachannel}/build node_modules/node-datachannel/build cp -r ${overridesNodeModules}/node_modules overrides/js/node_modules # don't run `npm ci` in `overrides/js` since we already copied node_modules into the directory substituteInPlace prepare.ts --replace-fail "'ci', '--production'" "'--version'" patchShebangs *.sh ''; preBuild = '' npm run build:src ''; npmBuildScript = "build:release"; installPhase = '' runHook preInstall # we don't actually use any of the generated tarballs, we just copy from the tmp directory, since that's easier mkdir -p $out/share/httptoolkit-server cp -r build/tmp/httptoolkit-server/* -r $out/share/httptoolkit-server # remove unneeded executables rm -r $out/share/httptoolkit-server/bin/httptoolkit-server* # since `oclif-dev pack` ran `npm install` again, we need to place the prebuilt binary here again ln -s ${nodeDatachannel}/build $out/share/httptoolkit-server/node_modules/node-datachannel/build # disable updating functionality substituteInPlace $out/share/httptoolkit-server/node_modules/@oclif/plugin-update/lib/commands/update.js  --replace-fail "await this.skipUpdate()" "'cannot update nix based package'" # the app determines if it's in production by checking if HTTPTOOLKIT_SERVER_BINPATH is set to anything makeWrapper $out/share/httptoolkit-server/bin/run $out/bin/httptoolkit-server  --set HTTPTOOLKIT_SERVER_BINPATH dummy  --prefix PATH : ${lib.makeBinPath [ nss.tools ]} runHook postInstall ''; passthru = { inherit nodeDatachannel; }; meta = { description = "Backend for HTTP Toolkit"; homepage = "https://httptoolkit.com/"; license = lib.licenses.agpl3Plus; mainProgram = "httptoolkit-server"; maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.unix; }; } </ins>


<del> { alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, dpkg, expat, fetchurl, fontconfig, freetype, gdk-pixbuf, glib, gtk3, lib, libdrm, libnotify, libsecret, libuuid, libxcb, libxkbcommon, mesa, nspr, nss, pango, stdenv, systemd, wrapGAppsHook3, xorg, }: let version = "1.43.0"; rpath = lib.makeLibraryPath [ alsa-lib at-spi2-atk at-spi2-core atk cairo cups curl dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libdrm libnotify libsecret libuuid libxcb libxkbcommon mesa nspr nss pango stdenv.cc.cc systemd xorg.libX11 xorg.libXScrnSaver xorg.libXcomposite xorg.libXcursor xorg.libXdamage xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrandr xorg.libXrender xorg.libXtst xorg.libxkbfile xorg.libxshmfence (lib.getLib stdenv.cc.cc) ]; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; sha256 = "sha256-hzPhF0NGwv+Lm+q5SoS8qv10UmuKf4RarGMkEeCxp9w="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; # NOTE While MongoDB Compass is available to darwin, I do not have resources to test it # Feel free to make a PR adding support if desired in stdenv.mkDerivation { pname = "mongodb-compass"; inherit version; inherit src; buildInputs = [ dpkg wrapGAppsHook3 gtk3 ]; dontUnpack = true; buildCommand = '' IFS=$'n' # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here dpkg --fsys-tarfile $src | tar --extract mkdir -p $out mv usr/* $out # cp -av $out/usr/* $out rm -rf $out/share/lintian # The node_modules are bringing in non-linux files/dependencies find $out -name "*.app" -exec rm -rf {} ; || true find $out -name "*.dll" -delete find $out -name "*.exe" -delete # Otherwise it looks "suspicious" chmod -R g-w $out for file in `find $out -type f -perm /0111 -o -name *.so*`; do echo "Manipulating file: $file" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true done wrapGAppsHook $out/bin/mongodb-compass ''; meta = with lib; { description = "GUI for MongoDB"; maintainers = with maintainers; [ bryanasdev000 ]; homepage = "https://github.com/mongodb-js/compass"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.sspl; platforms = [ "x86_64-linux" ]; mainProgram = "mongodb-compass"; }; } </del>


<del> { stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}: </del> <ins> { stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git , webkitSupport ? true }: </ins> stdenv.mkDerivation rec { name = "CopyQ-${version}"; <del> version = "2.9.0"; </del> <ins> version = "3.0.3"; </ins> src  = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; <del> sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f"; </del> <ins> sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl"; </ins> }; <ins> patches = [ ./cmake-modules.patch ]; </ins> nativeBuildInputs = [ cmake ]; <del> buildInputs = [ qt4 libXfixes libXtst ]; </del> <ins> buildInputs = [ git qt5.full libXfixes libXtst ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit; </ins> meta = with stdenv.lib; { homepage    = https://hluk.github.io/CopyQ;


, stdenv , fetchFromGitLab , writeText <ins> , substituteAll </ins> , meson , pkg-config , ninja


gdrive = callPackage ../applications/networking/gdrive { }; <ins> gdrive3 = callPackage ../applications/networking/gdrive3 { }; </ins> gdu = callPackage ../tools/system/gdu { }; gfxreconstruct = callPackage ../tools/graphics/gfxreconstruct { };


<ins> { stdenv , lib , config , fetchFromGitHub , testers , cmake , pkg-config , alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib , pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio , jackSupport ? true , libjack2 , coreaudioSupport ? stdenv.hostPlatform.isDarwin , darwin , validatePkgConfig }: stdenv.mkDerivation (finalAttrs: { pname = "rtaudio"; version = "6.0.1"; src = fetchFromGitHub { owner = "thestk"; repo = "rtaudio"; rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-Acsxbnl+V+Y4mKC1gD11n0m03E96HMK+oEY/YV7rlIY="; }; strictDeps = true; nativeBuildInputs = [ cmake pkg-config validatePkgConfig ]; buildInputs = lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals jackSupport [ libjack2 ] ++ lib.optionals coreaudioSupport [ darwin.apple_sdk.frameworks.CoreAudio ]; cmakeFlags = [ (lib.cmakeBool "RTAUDIO_API_ALSA" alsaSupport) (lib.cmakeBool "RTAUDIO_API_PULSE" pulseaudioSupport) (lib.cmakeBool "RTAUDIO_API_JACK" jackSupport) (lib.cmakeBool "RTAUDIO_API_CORE" coreaudioSupport) ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; homepage = "https://www.music.mcgill.ca/~gary/rtaudio/"; changelog = "https://github.com/thestk/rtaudio/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.unix; pkgConfigModules = [ "rtaudio" ]; }; }) </ins>


beta = stable; legacy_340 = generic { <del> version = "340.104"; sha256_32bit = "1l8w95qpxmkw33c4lsf5ar9w2fkhky4x23rlpqvp1j66wbw1b473"; sha256_64bit = "18k65gx6jg956zxyfz31xdp914sq3msn665a759bdbryksbk3wds"; settingsSha256 = "1vvpqimvld2iyfjgb9wvs7ca0b0f68jzfdpr0icbyxk4vhsq7sxk"; persistencedSha256 = "0zqws2vsrxbxhv6z0nn2galnghcsilcn3s0f70bpm6jqj9wzy7x8"; </del> <ins> version = "340.107"; sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd"; sha256_64bit = "0pv9yv3x0kg9hfkmc50xb54ahxkbnyy2vyy4hj2h0s6m9sb5kqz3"; settingsSha256 = "1rgaa24acdyqa1rqrx56293vxpskr792njqqpigqmps04llsx703"; persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l"; </ins> useGLVND = false; patches = maybePatch_drm_legacy ++ [ ./vm_operations_struct-fault.patch ];


dontWrapGApps = true; # we only want $gappsWrapperArgs here buildInputs = with xorg; [ <del> alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib </del> <ins> alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pipewire pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib </ins> ]; installPhase = ''


yara ]; <ins> # autoPatchelfHook only searches for *.so and *.so.*, and won't find *.hexpluglib # however, we will append to RUNPATH ourselves autoPatchelfIgnoreMissingDeps = [ "*.hexpluglib" ]; appendRunpaths = [ (lib.makeLibraryPath [ libGL ]) "${placeholder "out"}/lib/imhex/plugins" ]; </ins> cmakeFlags = [ "-DIMHEX_OFFLINE_BUILD=ON" "-DUSE_SYSTEM_CAPSTONE=ON"


<ins> { lib , mkDerivation , fetchFromGitHub , qmake }: mkDerivation { pname = "mathmod"; version = "11.1-unstable-2024-01-26"; src = fetchFromGitHub { owner = "parisolab"; repo = "mathmod"; rev = "24d03a04c17363520ae7cf077e72a7b8684eb6fd"; hash = "sha256-HiqHssPGqYEVZWchZRj4rFPc+xNVZk1ryl5qvFC2BmQ="; }; patches = [ ./fix-paths.patch ]; postPatch = '' substituteInPlace MathMod.pro --subst-var out ''; nativeBuildInputs = [ qmake ]; meta = { description = "A mathematical modelling software"; homepage = "https://github.com/parisolab/mathmod"; license = lib.licenses.gpl2Plus; mainProgram = "MathMod"; maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.unix; }; } </ins>


/usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES ''; }; <del> in if stdenv.isDarwin then darwin else linux </del> <ins> in if stdenv.isDarwin then darwin else linux </ins>


preStart = '' mkdir -m 0755 -p ${stateDir} ''; <del> script = "${heimdal}/sbin/kdc"; </del> <ins> script = "${heimdalFull}/sbin/kdc"; </ins> }; systemd.services.kpasswdd = { description = "Kerberos Password Changing daemon"; wantedBy = [ "multi-user.target" ]; <del> script = "${heimdal}/sbin/kpasswdd"; </del> <ins> script = "${heimdalFull}/sbin/kpasswdd"; </ins> }; };


}) {}; font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-plus"; <del> version = "20170101.947"; </del> <ins> version = "20170222.1755"; </ins> src = fetchurl { url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; <del> sha256 = "0ffs2c7gyhfa2mskdh7a1yp0na99kk282zm4zn56ljp55rrnnnh0"; </del> <ins> sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30"; </ins> }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";


{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config <del> , alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin </del> <ins> , alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages_10, writeShellScriptBin </ins> }: let


# this succeeds an external client will try to connect to the port # mapping. <del> import ./make-test-python.nix ({ pkgs, ... }: </del> <ins> import ./make-test-python.nix ({ pkgs, useNftables, ... }: </ins> let internalRouterAddress = "192.168.3.1";


wrapProgram $out/bin/ts3client  --set LD_PRELOAD "${libredirect}/lib/libredirect.so"  --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}"  <del> '' /* wayland is currently broken, remove when TS3 fixes that */ + '' --set QT_QPA_PLATFORM xcb  --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb </del> <ins> '' # wayland is currently broken, remove when TS3 fixes that + '' --set QT_QPA_PLATFORM xcb  --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb </ins> ''; dontStrip = true;


<ins> diff --git a/src/vteseq.cc b/src/vteseq.cc index 2330939d..e0ac14eb 100644 --- a/src/vteseq.cc +++ b/src/vteseq.cc @@ -3409,7 +3409,7 @@ vte_sequence_handler_iterm2_1337(VteTerminalPrivate *that, GValueArray *params) #define VTE_SEQUENCE_HANDLER(name) name static const struct vteseq_n_struct * -vteseq_n_lookup (register const char *str, register unsigned int len); +vteseq_n_lookup (register const char *str, register size_t len); #include"vteseq-n.cc" #undef VTE_SEQUENCE_HANDLER </ins>


<ins> { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ciao"; version = "1.19.0"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; rev = "v${version}"; sha256 = "03qzcb4ivgkiwdpw7a94dn74xqyxjwz5ilrr53rcblsh5ng299jp"; }; configurePhase = '' ./ciao-boot.sh configure --instype=global --prefix=$prefix ''; buildPhase = '' ./ciao-boot.sh build ''; installPhase = '' ./ciao-boot.sh install ''; meta = with stdenv.lib; { homepage = "https://ciao-lang.org/"; description = "A general purpose, multi-paradigm programming language in the Prolog family"; license = licenses.lgpl21; maintainers = with maintainers; [ suhr ]; platforms = platforms.unix; }; } </ins>


maintainers = with stdenv.lib.maintainers; [viric peti]; platforms = with stdenv.lib.platforms; unix; <ins> outputsToInstall = [ "out" "dnsutils" "host" ]; </ins> }; }


nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ]; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; <ins> # avoid double-wrapping dontWrapGApps = true; </ins> installPhase = '' runHook preInstall


}; production = true; }; <del> } </del>  No newline at end of file <ins> } </ins>


<del> #!/usr/bin/env nix-shell /* #!nix-shell -i node -p nodejs_18 */ import { promises as fs } from 'node:fs'; const constants = { githubUrl: "https://api.github.com/repos/pulsar-edit/pulsar/releases", sha256FileURL: (newVersion) => `https://github.com/pulsar-edit/pulsar/releases/download/v${newVersion}/SHA256SUMS.txt`, x86_64FileName: (newVersion) => `Linux.pulsar-${newVersion}.tar.gz`, aarch64FileName: (newVersion) => `ARM.Linux.pulsar-${newVersion}-arm64.tar.gz`, targetFile: new URL("default.nix", import.meta.url).pathname, }; async function utf16ToUtf8(blob) { // Sometime, upstream saves the SHA256SUMS.txt file in UTF-16, which absolutely breaks node's string handling // So we need to convert this blob to UTF-8 // We need to skip the first 2 bytes, which are the BOM const arrayBuffer = await blob.slice(2).arrayBuffer(); const buffer = Buffer.from(arrayBuffer); const utf8String = buffer.toString('utf16le'); return utf8String; } async function getLatestVersion() { const requestResult = await fetch(constants.githubUrl); if (!requestResult.ok) { console.error("Failed to fetch releases"); console.error(requestResult); process.exit(1); }; let jsonResult = await requestResult.json(); jsonResult = jsonResult.filter((release) => !release.prerelease && !release.draft); if (jsonResult.length == 0) { console.error("No releases found"); process.exit(1); } return jsonResult[0].tag_name.replace(/^v/, ''); } async function getSha256Sum(hashFileContent, targetFile) { // The upstream file has a fomat like this: // 0000000000000000000000000000000000000000000000000000000000000000 targetFile let sha256 = hashFileContent. split('n'). map(line => line.replace("r", "")). // Side-effect of the UTF-16 conversion, if the file was created from Windows filter((line) => line.endsWith(targetFile))[0]. split(' ')[0]; return "sha256-" + Buffer.from(sha256, 'hex').toString('base64'); } async function getSha256Sums(newVersion) { // Upstream provides a file with the hashes of the files, but it's not in the SRI format, and it refers to the compressed tarball // So let's just use nix-prefetch-url to get the hashes of the decompressed tarball, and `nix hash to-sri` to convert them to SRI format const hashFileUrl = constants.sha256FileURL(newVersion); const hashFileContent = await fetch(hashFileUrl).then((response) => response.blob()); const headerbuffer = await hashFileContent.slice(0, 2).arrayBuffer() const header = Buffer.from(headerbuffer).toString('hex'); // We must detect if it's UTF-16 or UTF-8. If it's UTF-16, we must convert it to UTF-8, otherwise just use it as-is const hashFileContentString = header == 'fffe' ? await utf16ToUtf8(hashFileContent) : await hashFileContent.text(); let x86_64; let aarch64; console.log("Getting new hashes"); let promises = [ getSha256Sum(hashFileContentString, constants.x86_64FileName(newVersion)).then((hash) => { x86_64 = hash; }), getSha256Sum(hashFileContentString, constants.aarch64FileName(newVersion)).then((hash) => { aarch64 = hash; }), ]; await Promise.all(promises); return { x86_64, aarch64 }; } async function updateFile(newVersion, sha256Sums, currentFile) { // There is some assumptions in how the file is formatted, but nothing egregious let newFile = currentFile.replace(/version = "(.*)";/, `version = "${newVersion}";`); newFile = newFile.replace(/x86_64-linux.hash = "(.*)";/, `x86_64-linux.hash = "${sha256Sums.x86_64}";`); newFile = newFile.replace(/aarch64-linux.hash = "(.*)";/, `aarch64-linux.hash = "${sha256Sums.aarch64}";`); await fs.writeFile(constants.targetFile, newFile); }; let currentFile = await fs.readFile(constants.targetFile, 'utf8'); let currentVersion = currentFile.match(/version = "(.*)";/)[1]; const newVersion = await getLatestVersion(); if (currentVersion === newVersion) { console.error("Already up to date"); process.exit(0); } console.log("New version: " + newVersion); const sha256Sums = await getSha256Sums(newVersion); console.log(sha256Sums) if (!sha256Sums.x86_64 || !sha256Sums.aarch64) { console.error("Failed to find sha256 sums for the 2 files"); process.exit(1); } updateFile(newVersion, sha256Sums, currentFile); </del>


{ stdenv, fetchurl, makeWrapper, makeDesktopItem , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg <del> , lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome </del> <ins> , lsb-release, freetype, fontconfig, polkit, polkit_gnome </ins> , pulseaudio }: let


{ buildPythonPackage, fetchPypi, lib, isPy3k <del> , pkgconfig, igraph }: </del> <ins> , pkgconfig, igraph , texttable }: </ins> buildPythonPackage rec { pname = "python-igraph";


<ins> --- a/llm/generate/gen_common.sh +++ b/llm/generate/gen_common.sh @@ -86,7 +89,7 @@ cmake -S ${LLAMACPP_DIR} -B ${BUILD_DIR} ${CMAKE_DEFS} cmake --build ${BUILD_DIR} ${CMAKE_TARGETS} -j8 mkdir -p ${BUILD_DIR}/lib/ -    g++ -fPIC -g -shared -o ${BUILD_DIR}/lib/libext_server.${LIB_EXT}  +    $CXX -fPIC -g -shared -o ${BUILD_DIR}/lib/libext_server.${LIB_EXT}  ${GCC_ARCH}  ${WHOLE_ARCHIVE} ${BUILD_DIR}/examples/server/libext_server.a ${NO_WHOLE_ARCHIVE}  ${BUILD_DIR}/common/libcommon.a  </ins>


{ lib, stdenv, fetchurl, pkg-config, zlib, kmod, which <ins> , hwdata </ins> , static ? stdenv.hostPlatform.isStatic , darwin ? null }:


which # Needed by gdialog, including in the steam-runtime perl <del> ] ++ lib.optional withJava jdk ++ lib.optional withPrimus (primus.override { stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ]; }) ; </del> <ins> ] ++ lib.optional withJava jdk ++ lib.optional withPrimus (primus.override { stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ]; }); </ins> <del> multiPkgs = pkgs: with pkgs; [ </del> <ins> multiPkgs = pkgs: with pkgs; [ </ins> # These are required by steam with proper errors xlibs.libXcomposite xlibs.libXtst


<del> { stdenv, fetchurl, pkgconfig, glib, libintl }: </del> <ins> { stdenv, fetchurl, fetchpatch, pkgconfig, glib, libintl }: </ins> with stdenv.lib;


owner = "tud-zih-energy"; repo = "FIRESTARTER"; rev = "v${version}"; <del> sha256 = "161mg0h1hvp6bxfjdhyfqrljvphys896mfd36254rbgzxm38ibi7"; </del> <ins> sha256 = "0zqfqb7hf48z39g1qhbl1iraf8rz4d629h1q6ikizckpzfq23kd0"; </ins> }; nativeBuildInputs = [ python3 ];


{ lib , buildGoModule , fetchFromGitHub <del> , llama-cpp </del> <ins> , fetchpatch , buildEnv , linkFarm , overrideCC , makeWrapper , stdenv , cmake , gcc12 , clblast , libdrm , rocmPackages , cudaPackages , linuxPackages , darwin , enableRocm ? false , enableCuda ? false </ins> }: <del> buildGoModule rec { </del> <ins> let </ins> pname = "ollama"; <del> version = "0.1.17"; </del> <ins> version = "0.1.24"; warnIfNotLinux = warning: (lib.warnIfNot stdenv.isLinux warning stdenv.isLinux); gpuWarning = api: "building ollama with ${api} is only supported on linux; falling back to cpu"; rocmIsEnabled = enableRocm && (warnIfNotLinux (gpuWarning "rocm")); cudaIsEnabled = enableCuda && (warnIfNotLinux (gpuWarning "cuda")); enableLinuxGpu = rocmIsEnabled || cudaIsEnabled; appleFrameworks = darwin.apple_sdk_11_0.frameworks; metalFrameworks = [ appleFrameworks.Accelerate appleFrameworks.Metal appleFrameworks.MetalKit appleFrameworks.MetalPerformanceShaders ]; </ins> src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; <del> hash = "sha256-eXukNn9Lu1hF19GEi7S7a96qktsjnmXCUp38gw+3MzY="; </del> <ins> hash = "sha256-GwZA1QUH8I8m2bGToIcMMaB5MBnioQP4+n1SauUJYP8="; fetchSubmodules = true; }; preparePatch = patch: hash: fetchpatch { url = "file://${src}/llm/patches/${patch}"; inherit hash; stripLen = 1; extraPrefix = "llm/llama.cpp/"; </ins> }; <ins> inherit (lib) licenses platforms maintainers; ollama = { inherit pname version src; vendorHash = "sha256-wXRbfnkbeXPTOalm7SFLvHQ9j46S/yLNbFy+OWNSamQ="; </ins> <del> patches = [ # disable passing the deprecated gqa flag to llama-cpp-server # see https://github.com/ggerganov/llama.cpp/issues/2975 ./disable-gqa.patch </del> <ins> nativeBuildInputs = [ cmake ] ++ lib.optionals enableLinuxGpu [ makeWrapper ] ++ lib.optionals stdenv.isDarwin metalFrameworks; </ins> <del> # replace the call to the bundled llama-cpp-server with the one in the llama-cpp package ./set-llamacpp-path.patch ]; </del> <ins> patches = [ # remove uses of `git` in the `go generate` script # instead use `patch` where necessary ./remove-git.patch # replace a hardcoded use of `g++` with `$CXX` ./replace-gcc.patch </ins> <del> postPatch = '' substituteInPlace llm/llama.go  --subst-var-by llamaCppServer "${llama-cpp}/bin/llama-cpp-server" substituteInPlace server/routes_test.go --replace "0.0.0" "${version}" ''; </del> <ins> # ollama's patches of llama.cpp's example server # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" (preparePatch "01-cache.diff" "sha256-PC4yN98hFvK+PEITiDihL8ki3bJuLVXrAm0CGf8GPJE=") (preparePatch "02-shutdown.diff" "sha256-cElAp9Z9exxN964vB/YFuBhZoEcoAwGSMCnbh+l/V4Q=") ]; postPatch = '' # use a patch from the nix store in the `go generate` script substituteInPlace llm/generate/gen_common.sh  --subst-var-by cmakeIncludePatch '${./cmake-include.patch}' # `ollama/llm/generate/gen_common.sh` -> "avoid duplicate main symbols when we link into the cgo binary" substituteInPlace llm/llama.cpp/examples/server/server.cpp  --replace-fail 'int main(' 'int __main(' # replace inaccurate version number with actual release version substituteInPlace version/version.go --replace-fail 0.0.0 '${version}' ''; preBuild = '' export OLLAMA_SKIP_PATCHING=true # build llama.cpp libraries for ollama go generate ./... ''; </ins> <del> vendorHash = "sha256-yGdCsTJtvdwHw21v0Ot6I8gxtccAvNzZyRu1T0vaius="; </del> <ins> ldflags = [ "-s" "-w" "-X=github.com/jmorganca/ollama/version.Version=${version}" "-X=github.com/jmorganca/ollama/server.mode=release" ]; </ins> <del> ldflags = [ "-s" "-w" "-X=github.com/jmorganca/ollama/version.Version=${version}" "-X=github.com/jmorganca/ollama/server.mode=release" ]; </del> <ins> meta = { description = "Get up and running with large language models locally"; homepage = "https://github.com/jmorganca/ollama"; license = licenses.mit; platforms = platforms.unix; mainProgram = "ollama"; maintainers = with maintainers; [ abysssol dit7ya elohmeier ]; }; }; </ins> <del> meta = with lib; { description = "Get up and running with large language models locally"; homepage = "https://github.com/jmorganca/ollama"; license = licenses.mit; mainProgram = "ollama"; maintainers = with maintainers; [ dit7ya elohmeier ]; platforms = platforms.unix; </del> <ins> rocmClang = linkFarm "rocm-clang" { llvm = rocmPackages.llvm.clang; }; rocmPath = buildEnv { name = "rocm-path"; paths = [ rocmPackages.rocm-device-libs rocmClang ]; }; rocmVars = { ROCM_PATH = rocmPath; CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; </ins> }; <del> } </del> <ins> cudaToolkit = buildEnv { name = "cuda-toolkit"; ignoreCollisions = true; # FIXME: find a cleaner way to do this without ignoring collisions paths = [ cudaPackages.cudatoolkit cudaPackages.cuda_cudart ]; }; cudaVars = { CUDA_LIB_DIR = "${cudaToolkit}/lib"; CUDACXX = "${cudaToolkit}/bin/nvcc"; CUDAToolkit_ROOT = cudaToolkit; }; linuxGpuLibs = { buildInputs = lib.optionals rocmIsEnabled [ rocmPackages.clr rocmPackages.hipblas rocmPackages.rocblas rocmPackages.rocsolver rocmPackages.rocsparse libdrm ] ++ lib.optionals cudaIsEnabled [ cudaPackages.cuda_cudart ]; }; appleGpuLibs = { buildInputs = metalFrameworks; }; runtimeLibs = lib.optionals rocmIsEnabled [ rocmPackages.rocm-smi ] ++ lib.optionals cudaIsEnabled [ linuxPackages.nvidia_x11 ]; runtimeLibWrapper = { postFixup = '' mv "$out/bin/${pname}" "$out/bin/.${pname}-unwrapped" makeWrapper "$out/bin/.${pname}-unwrapped" "$out/bin/${pname}"  --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath runtimeLibs}' ''; }; goBuild = if cudaIsEnabled then buildGoModule.override { stdenv = overrideCC stdenv gcc12; } else buildGoModule; in goBuild (ollama // (lib.optionalAttrs rocmIsEnabled rocmVars) // (lib.optionalAttrs cudaIsEnabled cudaVars) // (lib.optionalAttrs enableLinuxGpu linuxGpuLibs) // (lib.optionalAttrs enableLinuxGpu runtimeLibWrapper) // (lib.optionalAttrs stdenv.isDarwin appleGpuLibs)) </ins>


, wrapQtAppsHook , extra-cmake-modules , qtbase <ins> , qtwayland </ins> , qtsvg , qtimageformats , qt5compat


echo "Adding contents..." for item in ${toString contents}; do echo "Adding $item..." <del> rsync -a $item/ layer/ </del> <ins> rsync -ak $item/ layer/ </ins> done '';


--bash completion/bash-completion ''; <del> nativeBuildInputs = [ installShellFiles ]; </del> <ins> nativeBuildInputs = [ installShellFiles ]; </ins> <del> buildInputs = [ babel ]; </del> <ins> buildInputs = [ babel ]; </ins> propagatedBuildInputs = [ androguard <ins> appdirs </ins> clint defusedxml gitpython libcloud mwclient <ins> oscrypto </ins> paramiko pillow pyasn1


Path to the unix socket file on which to accept FastCGI requests. <note><para>This option is read-only and managed by NixOS.</para></note> ''; <ins> example = "${runtimeDir}/<name>.sock"; </ins> }; listen = mkOption {


{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook <del> , libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify </del> <ins> , libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook </ins> }: let


{ meta = { <del> maintainers = teams.freedesktop.members; </del> <ins> maintainers = teams.freedesktop.members ++ [ lib.maintainers.janik ]; </ins> }; ###### interface


++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch <del> ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; sha256 = "1nyjnshpq5gbcbbpfv27hy4ajvycmgkpiabkjlxnnrnq1d99k1ay"; }); </del> <ins> # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; </ins> /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";


homepage = "https://libdatachannel.org/"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ erdnaxe ]; <del> platforms = platforms.linux; </del> <ins> platforms = platforms.linux ++ platforms.darwin; </ins> }; }


nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools fixDarwinDylibNames <ins> ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook </ins> ]; dontConfigure = true; <del> buildPhase = let ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; in '' runHook preBuild </del> <ins> buildPhase = let ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; in '' runHook preBuild </ins> <del> (cd lpsolve55 && bash -x -e ${ccc}) (cd lp_solve  && bash -x -e ${ccc}) </del> <ins> (cd lpsolve55 && bash -x -e ${ccc}) (cd lp_solve  && bash -x -e ${ccc}) </ins> <del> runHook postBuild ''; </del> <ins> runHook postBuild ''; </ins> installPhase = '' runHook preInstall


<ins> { lib, alsa-lib, callPackage, cmake, ffmpeg, fribidi, game-music-emu, libXdmcp, libXv, libass, libcddb, libcdio, libpulseaudio, libsidplayfp, libva, libxcb, ninja, pkg-config, qt5, qt6, stdenv, taglib, vulkan-headers, vulkan-tools, # Configurable options qtVersion ? "6", # Can be 5 or 6 }: let sources = callPackage ./sources.nix { }; in assert lib.elem qtVersion [ "5" "6" ]; stdenv.mkDerivation (finalAttrs: { pname = sources.qmplay2.pname + "-qt" + qtVersion; inherit (sources.qmplay2) version src; postPatch = '' pushd src cp -va ${sources.qmvk.src}/* qmvk/ chmod --recursive 744 qmvk popd ''; nativeBuildInputs = [ cmake ninja pkg-config ] ++ lib.optionals (qtVersion == "6") [ qt6.wrapQtAppsHook ] ++ lib.optionals (qtVersion == "5") [ qt5.wrapQtAppsHook ]; buildInputs = [ alsa-lib ffmpeg fribidi game-music-emu libXdmcp libXv libass libcddb libcdio libpulseaudio libsidplayfp libva libxcb taglib vulkan-headers vulkan-tools ] ++ lib.optionals (qtVersion == "6") [ qt6.qt5compat qt6.qtbase qt6.qtsvg qt6.qttools ] ++ lib.optionals (qtVersion == "5") [ qt5.qtbase qt5.qttools ]; strictDeps = true; # Because we think it is better to use only lowercase letters! # But sometimes we come across case-insensitive filesystems... postInstall = '' [ -e $out/bin/qmplay2 ] || ln -s $out/bin/QMPlay2 $out/bin/qmplay2 ''; passthru = { inherit sources; }; meta = { homepage = "https://github.com/zaps166/QMPlay2/"; description = "Qt-based Multimedia player"; longDescription = '' QMPlay2 is a video and audio player. It can play all formats supported by FFmpeg and libmodplug (including J2B and SFX). It also supports Audio CD, raw files, Rayman 2 music, and chiptunes. It also contains YouTube and MyFreeMP3 browser. ''; license = lib.licenses.lgpl3Plus; mainProgram = "qmplay2"; maintainers = with lib.maintainers; [ AndersonTorres kashw2 ]; platforms = lib.platforms.linux; }; }) </ins>


installPhase = '' runHook preInstall <del> # TODO: Remove when the next stable Itch is stabilized substituteInPlace ./resources/app/package.json  --replace "kitch" "itch" </del> mkdir -p $out/bin $out/share/itch/resources/app cp -r resources/app "$out/share/itch/resources/" install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" <del> for icon in $icons/icon*.png </del> <ins> for icon in ${icons}/icon*.png </ins> do <del> iconsize="''${icon#$icons/icon}" </del> <ins> iconsize="''${icon#${icons}/icon}" </ins> iconsize="''${iconsize%.png}" icondir="$out/share/icons/hicolor/''${iconsize}x''${iconsize}/apps/" install -Dm644 "$icon" "$icondir/itch.png"


qpageview = callPackage ../development/python-modules/qpageview { }; <ins> qpsolvers = callPackage ../development/python-modules/qpsolvers { }; </ins> qrcode = callPackage ../development/python-modules/qrcode { }; qreactor = callPackage ../development/python-modules/qreactor { };


}; nativeBuildInputs = [ <ins> # uname output embedded in https://gitlab.gnome.org/GNOME/libgtop/-/blob/master/src/daemon/Makefile.am deterministic-uname </ins> pkg-config gtk-doc perl


<ins> { lib, flutter324, fetchFromGitHub, webkitgtk, sqlite, libayatana-appindicator, makeDesktopItem, copyDesktopItems, imagemagick, makeWrapper, xdg-user-dirs, }: let # fetch simple-icons directly to avoid cloning with submodules, # which would also clone a whole copy of flutter simple-icons = fetchFromGitHub (lib.importJSON ./simple-icons.json); in flutter324.buildFlutterApplication rec { pname = "ente-auth"; version = "4.0.2"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "auth" ]; rev = "auth-v${version}"; hash = "sha256-me+fT79vwqBBNsRWWo58GdzBf58LNB4Mk+pmCLvn/ik="; }; sourceRoot = "${src.name}/auth"; pubspecLock = lib.importJSON ./pubspec.lock.json; patchPhase = '' rmdir assets/simple-icons ln -s ${simple-icons} assets/simple-icons ''; gitHashes = { desktop_webview_window = "sha256-jdNMpzFBgw53asWlGzWUS+hoPdzcL6kcJt2KzjxXf2E="; ente_crypto_dart = "sha256-XBzQ268E0cYljJH6gDS5O0Pmie/GwuhMDlQPfopSqJM="; flutter_local_authentication = "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0="; flutter_secure_storage_linux = "sha256-x45jrJ7pvVyhZlpqRSy3CbwT4Lna6yi/b2IyAilWckg="; sqflite = "sha256-TdvCtEO7KL1R2oOSwGWllmS5kGCIU5CkvvUqUJf3tUc="; }; nativeBuildInputs = [ copyDesktopItems imagemagick makeWrapper ]; buildInputs = [ webkitgtk sqlite libayatana-appindicator ]; # Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml # and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/ente_auth.appdata.xml desktopItems = makeDesktopItem { name = "ente_auth"; exec = "ente_auth"; icon = "ente-auth"; desktopName = "Ente Auth"; genericName = "Ente Authentication"; comment = "Open source 2FA authenticator, with end-to-end encrypted backups"; categories = [ "Utility" ]; keywords = [ "Authentication" "2FA" ]; mimeTypes = [ "x-scheme-handler/enteauth" ]; startupNotify = false; }; postInstall = '' FAV=$out/app/data/flutter_assets/assets/icons/auth-icon.png ICO=$out/share/icons install -D $FAV $ICO/ente-auth.png for size in 24 32 42 64 128 256 512; do D=$ICO/hicolor/''${size}x''${size}/apps mkdir -p $D magick $FAV -resize ''${size}x''${size} $D/ente-auth.png done install -Dm444 linux/packaging/ente_auth.appdata.xml -t $out/share/metainfo wrapProgram $out/bin/ente_auth  --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]} ''; passthru.updateScript = ./update.sh; meta = { description = "End-to-end encrypted, cross platform and free app for storing your 2FA codes with cloud backups"; longDescription = '' Ente's 2FA app. An end-to-end encrypted, cross platform and free app for storing your 2FA codes with cloud backups. Works offline. You can even use it without signing up for an account if you don't want the cloud backups or multi-device sync. ''; homepage = "https://ente.io/auth/"; changelog = "https://github.com/ente-io/ente/releases/tag/auth-v${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ niklaskorz schnow265 zi3m5f gepbird ]; mainProgram = "ente_auth"; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } </ins>


meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; <ins> coc-svelte = buildVimPluginFrom2Nix { pname = "coc-svelte"; version = "2022-03-14"; src = fetchFromGitHub { owner = "coc-extensions"; repo = "coc-svelte"; rev = "7dda98527c0831e287ae8cd1c85cfc958c949d4a"; sha256 = "0ci35dph7zz53hiw65xp79g6i8h5yk1zlcbinljfcdn5635wsjbn"; }; meta.homepage = "https://github.com/coc-extensions/coc-svelte/"; }; coc-tailwindcss = buildVimPluginFrom2Nix { pname = "coc-tailwindcss"; version = "2020-08-19"; src = fetchFromGitHub { owner = "iamcco"; repo = "coc-tailwindcss"; rev = "5f41aa1feb36e39b95ccd83be6a37ee8c475f9fb"; sha256 = "189abl36aj862m5nz8jjdgdfc4s6xbag030hi9m13yd6fbg99f85"; }; meta.homepage = "https://github.com/iamcco/coc-tailwindcss/"; }; </ins> coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; version = "2022-03-26";


statix = buildVimPluginFrom2Nix rec { inherit (statix) pname src meta; version = "0.1.0"; <del> dependencies = with self; [ statix ]; </del> postPatch = '' # check that version is up to date grep 'pname = "statix-vim"' -A 1 flake.nix


mkdir -p $out/share/{java,applications} cp ${module}-${version}.jar $out/share/java/. cp "${editorItem}/share/applications/"* $out/share/applications <del> makeWrapper ${jre8}/bin/java $out/bin/$exec  </del> <ins> makeWrapper ${jdk}/bin/java $out/bin/$exec  </ins> --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"  --add-flags "-jar $out/share/java/${module}-${version}.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" '';


let <del> _enableDitaaFilter = enableExtraPlugins || enableDitaaFilter; </del> <ins> _enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter; </ins> _enableMscgenFilter = enableExtraPlugins || enableMscgenFilter; _enableDiagFilter = enableExtraPlugins || enableDiagFilter; _enableQrcodeFilter = enableExtraPlugins || enableQrcodeFilter;


<ins> diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h index 06ca90564f0..bb244f8f358 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -30,6 +30,7 @@ #include <amdgpu.h> #include <pthread.h> +#include <sys/types.h> #include "util/list.h" #include "util/rwlock.h" #include "ac_gpu_info.h" diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h index 22f99c41909..2f3195926be 100644 --- a/src/gallium/drivers/freedreno/freedreno_util.h +++ b/src/gallium/drivers/freedreno/freedreno_util.h @@ -108,6 +108,8 @@ extern bool fd_binning_enabled; #include <sys/types.h> #include <sys/syscall.h> +#define gettid() ((pid_t)syscall(SYS_gettid)) + #define DBG(fmt, ...)                                                           do {                                                                         if (FD_DBG(MSGS))                                                         diff --git a/src/gallium/frontends/nine/nine_debug.c b/src/gallium/frontends/nine/nine_debug.c index f3a6a945025..f4a6c41a612 100644 --- a/src/gallium/frontends/nine/nine_debug.c +++ b/src/gallium/frontends/nine/nine_debug.c @@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag, { static boolean first = TRUE; static unsigned long dbg_flags = DBG_ERROR | DBG_WARN; -    unsigned long tid = 0; +    pthread_t tid = 0; if (first) { first = FALSE; @@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag, #if defined(HAVE_PTHREAD) if (dbg_flags & DBG_TID) -        tid = (unsigned long)pthread_self(); +        tid = pthread_self(); #endif if (dbg_flags & flag) { diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c index 81b64f1ea71..56ebd2eccdf 100644 --- a/src/util/rand_xor.c +++ b/src/util/rand_xor.c @@ -28,6 +28,7 @@ #if defined(HAVE_GETRANDOM) #include <sys/random.h> #endif +#include <sys/types.h>         /* size_t, ssize_t */ #include <unistd.h> #include <fcntl.h> #endif </ins>


wl-screenrec = callPackage ../tools/wayland/wl-screenrec { }; <ins> wleave = callPackage ../tools/wayland/wleave { }; </ins> wlogout = callPackage ../tools/wayland/wlogout { }; wlopm = callPackage ../tools/wayland/wlopm { };


owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; <del> hash = "sha256-rB/zaJavA3OH1HK7Rfpta/QmQzi0xsEYTvW5JzzTAlI="; </del> <ins> hash = "sha256-PFXXd5ToBbvuGl+u4nEAHy1F696lxHD3PrPJ3Tpb+eg="; </ins> }; patches = [


homepage = https://github.com/thestinger/termite/; maintainers = with maintainers; [ koral garbas ]; platforms = platforms.all; <del> broken = true; </del> }; }; in if configFile == null then termite else symlinkJoin {


timerConfig.OnCalendar = cfg.dump.interval; }; }; <ins> meta.maintainers = with lib.maintainers; [ srhb ]; </ins> }


buildGoModule rec { pname = "apx"; <del> version = "1.7.0-1"; </del> <ins> version = "1.8.2"; </ins> src = fetchFromGitHub { owner = "Vanilla-OS"; repo = pname; <del> rev = "v${version}"; hash = "sha256-tonI3S0a08MbR369qaKS2BoWc3QzXWzTuGx/zSgUz7s="; </del> <ins> rev = "refs/tags/${version}"; hash = "sha256-nBhSl4r7LlgCA5/HCLpOleihE5n/JCJgf43KdCklQbg="; </ins> }; vendorSha256 = null;


<ins> --- a/llm/generate/gen_common.sh +++ b/llm/generate/gen_common.sh @@ -60,6 +60,9 @@ } apply_patches() { +    patch -i '@cmakeIncludePatch@' "${LLAMACPP_DIR}/examples/server/CMakeLists.txt" +    return + # Wire up our CMakefile if ! grep ollama ${LLAMACPP_DIR}/examples/server/CMakeLists.txt; then echo 'include (../../../ext_server/CMakeLists.txt) # ollama' >>${LLAMACPP_DIR}/examples/server/CMakeLists.txt @@ -113,6 +116,8 @@ # Keep the local tree clean after we're done with the build cleanup() { +    return + (cd ${LLAMACPP_DIR}/examples/server/ && git checkout CMakeLists.txt server.cpp) if [ -n "$(ls -A ../patches/*.diff)" ]; then </ins>


"-Ddocs-build=true" ]; <ins> preConfigure = '' export KBUILD_BUILD_TIMESTAMP="$(date -u -d @$SOURCE_DATE_EPOCH)" ''; </ins> doCheck = true; meta = with lib; {


cp "${sweethome3dItem}/share/applications/"* $out/share/applications <del> # MESA_GL_VERSION_OVERRIDE is needed since the update from MESA 19.3.3 to 20.0.2: # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null" # exception is thrown on startup. # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753 makeWrapper ${jre8}/bin/java $out/bin/$exec  --set MESA_GL_VERSION_OVERRIDE 2.1  </del> <ins> makeWrapper ${jdk}/bin/java $out/bin/$exec  </ins> --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"  <ins> --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"  </ins> --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"


extraArgs = [ "--version-regex" "r(.*)" ]; }; <del> nativeBuildInputs = [ cmake pkg-config ]; </del> <ins> nativeBuildInputs = [ cmake pkg-config ] ++ lib.optional buildAudaciousPlugin gtk3; </ins> <del> buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ]; </del> <ins> buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ] ++ lib.optional buildAudaciousPlugin (audacious.override { audacious-plugins = null; }); preConfigure = '' substituteInPlace cmake/dependencies/audacious.cmake  --replace "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR "$out/lib/audacious")" ''; </ins> cmakeFlags = [ <del> # There's no nice way to build the audacious plugin without a circular dependency "-DBUILD_AUDACIOUS=OFF" </del> # It always tries to download it, no option to use the system one "-DUSE_CELT=OFF" <del> ]; </del> <ins> ] ++ lib.optional (! buildAudaciousPlugin) "-DBUILD_AUDACIOUS=OFF"; </ins> meta = with lib; { description = "A library for playback of various streamed audio formats used in video games";


<ins> { lib , stdenv , rustPlatform , fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "evebox"; version = "0.17.2"; src = fetchFromGitHub { owner = "jasonish"; repo = "evebox"; rev = version; hash = "sha256-djL5cdudJNPAWLMQPS2Dkcc9H/gouOuu8evcBDdY9wA="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "libsqlite3-sys-0.25.2" = "sha256-+c7ong6ca4WkEHl7ynCNn3WW68jF3pSYbllRsaNFGLc="; "suricatax-rule-parser-0.1.0" = "sha256-upWgOKSAuj0pYGTeYKANzwutoF/m4AQ7MkzGYXmPbEo="; }; }; meta = { description = "Web Based Event Viewer (GUI) for Suricata EVE Events in Elastic Search"; homepage = "https://evebox.org/"; changelog = "https://github.com/jasonish/evebox/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ felbinger ]; broken = stdenv.isDarwin; }; } </ins>


<del> diff --git a/bin/nexus b/bin/nexus index e7ed3fb..8db766b 100755 --- a/bin/nexus +++ b/bin/nexus @@ -440,7 +440,8 @@ add_class_path "$app_home/lib/boot/org.apache.karaf.diagnostic.boot-4.0.9.jar" add_class_path "$app_home/lib/boot/org.apache.karaf.jaas.boot-4.0.9.jar" vmoptions_val="" -read_vmoptions "$prg_dir/$progname.vmoptions" +VM_OPTS=${VM_OPTS_FILE:-"$prg_dir/$progname.vmoptions"} +read_vmoptions "$VM_OPTS" INSTALL4J_ADD_VM_PARAMS="$INSTALL4J_ADD_VM_PARAMS $vmoptions_val" </del>


(mkChangedOptionModule [ "security" "initialRootPassword" ] [ "users" "users" "root" "initialHashedPassword" ] <del> (cfg: if cfg.security.initialHashedPassword == "!" </del> <ins> (cfg: if cfg.security.initialRootPassword == "!" </ins> then null <del> else cfg.security.initialHashedPassword)) </del> <ins> else cfg.security.initialRootPassword)) </ins> ]; ###### interface


in stdenv.mkDerivation rec { pname = "mpv"; <del> version = "0.33.1"; </del> <ins> version = "0.34.0"; </ins> <del> outputs = [ "out" "dev" ]; </del> <ins> outputs = [ "out" "dev" "man" ]; </ins> src = fetchFromGitHub { <del> owner  = "mpv-player"; repo   = "mpv"; rev    = "v${version}"; sha256 = "06rw1f55zcsj78ql8w70j9ljp2qb1pv594xj7q9cmq7i92a7hq45"; </del> <ins> owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; sha256 = "sha256-qa6xZV4aLcHBMa2bIqoKjte4+KWEGGZre4L0u1+eDE8="; </ins> }; <del> patches = [ # To make mpv build with libplacebo 3.104.0: (fetchpatch { # vo_gpu: placebo: update for upstream API changes url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch"; sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx"; }) # TOREMOVE when > 0.33.1 # youtube-dl has been abandonned and is now unusable w/ # youtube.com. Mpv migrated to yt-dlp since the 0.33.1 but did not # cut a new release yet. See # https://github.com/mpv-player/mpv/pull/9209 (fetchpatch { url = "https://github.com/mpv-player/mpv/commit/d1c92bfd79ef81ac804fcc20aee2ed24e8d587aa.patch"; sha256 = "1dwxzng3gsrx0gjljm5jmfcjz3pzdss9z2l0n25rmmb4nbcrcx1f"; }) ]; </del> postPatch = '' patchShebangs ./TOOLS/ ''; <del> passthru = { inherit # The wrapper consults luaEnv and lua.version luaEnv lua # In the wrapper, we want to reference vapoursynth which has the # `python3` passthru attribute (which has the `sitePrefix` # attribute). This way we'll be sure that in the wrapper we'll # use the same python3.sitePrefix used to build vapoursynth. vapoursynthSupport vapoursynth ; }; NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext " + optionalString stdenv.isDarwin "-framework CoreFoundation"; </del> <ins> NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; </ins> wafConfigureFlags = [ "--enable-libmpv-shared"


return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { -      return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache')); <del> +      return _fileSystem.directory(_fileSystem.path.join(homeDirPath, '.cache', 'flutter')); </del> <ins> +      return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); </ins> } }


bitwise = callPackage ../tools/misc/bitwise { }; <ins> blanket = callPackage ../applications/audio/blanket { }; </ins> brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ;


inherit (pkgs) xmlsec; }; <ins> pysatochip = callPackage ../development/python-modules/pysatochip { }; </ins> pysc2 = callPackage ../development/python-modules/pysc2 { }; pyscard = callPackage ../development/python-modules/pyscard {


enableParallelBuilding = true; postPatch = '' <ins> substituteInPlace contrib/smime_keys  --replace /usr/bin/openssl ${openssl}/bin/openssl </ins> for f in doc/*.{xml,xsl}*  ; do substituteInPlace $f  --replace http://docbook.sourceforge.net/release/xsl/current     ${docbook_xsl}/share/xml/docbook-xsl


}; url_preview_ip_range_blacklist = mkOption { type = types.listOf types.str; <del> default = []; </del> <ins> default = [ "127.0.0.0/8" "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16" "100.64.0.0/10" "169.254.0.0/16" ]; </ins> description = '' List of IP address CIDR ranges that the URL preview spider is denied from accessing.


# If multiple remote sources are enabled, nuget will try them all # concurrently and use the one that responds first. We always use the # first source that has the package. <del> echo "$package $version is available on $url, but was downloaded from ${base_addresses[$used_source]}$package/$version/$package.$version.nupkg" 1>&2 </del> <ins> echo "$package $version is available at $url, but was restored from $used_source" 1>&2 </ins> found=true break else


, fetchpatch , python3Packages , asciidoc <del> , makeWrapper </del> <ins> , wrapGAppsNoGuiHook </ins> , iw }:


<del> { lib, stdenv, fetchFromGitHub } : </del> <ins> { lib , stdenv , fetchFromGitHub , netpbm }: </ins> stdenv.mkDerivation rec { pname = "fbcat";


<ins> --- a/llm/llama.cpp/examples/server/CMakeLists.txt +++ b/llm/llama.cpp/examples/server/CMakeLists.txt @@ -11,3 +11,4 @@ TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ws2_32) endif() target_compile_features(${TARGET} PRIVATE cxx_std_11) +include (../../../ext_server/CMakeLists.txt) # ollama </ins>


print("skipping systemd-boot update to %s because of known regression" % available_version) else: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) <del> subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"]) </del> <ins> subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"]) </ins> mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries")


moveToOutput bin/isc-config.sh $dev moveToOutput bin/host $host <del> ln -sf $host/bin/host $bin/bin </del> moveToOutput bin/dig $dnsutils moveToOutput bin/nslookup $dnsutils moveToOutput bin/nsupdate $dnsutils <del> ln -sf $dnsutils/bin/{dig,nslookup,nsupdate} $bin/bin ln -sf $host/bin/host $dnsutils/bin </del> for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g'


librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; <ins> libgcc = stdenv.cc.cc.libgcc or null; </ins> # This is for e.g. LLVM libraries on linux. gccForLibs = if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU


sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; <del> extraPatches = [ ]; </del> <ins> extraPatches = [ reapplyPathSanitizerPatch ]; </ins> }; }


<ins> { config, lib, pkgs, ... }: let cfg = config.programs.darling; in { options = { programs.darling = { enable = lib.mkEnableOption (lib.mdDoc "Darling, a Darwin/macOS compatibility layer for Linux"); package = lib.mkPackageOptionMD pkgs "darling" {}; }; }; config = lib.mkIf cfg.enable { security.wrappers.darling = { source = lib.getExe cfg.package; owner = "root"; group = "root"; setuid = true; }; }; } </ins>


{ stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb <del> , dbus, librdmacm, libibverbs, libstatgrab, net_snmp </del> <ins> , dbus, rdma-core, libstatgrab, net_snmp </ins> , enableDbus ? false , enableInfiniBandRdma ? false , enableMonitoring ? false


<ins> { "name": "ember-cli", "version": "5.3.0", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", "app-kit", "blockchain", "cli", "ember", "ember-app-kit", "ember.js", "kit" ], "homepage": "https://cli.emberjs.com/release/", "bugs": { "url": "https://github.com/ember-cli/ember-cli/issues" }, "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git" }, "license": "MIT", "author": "Stefan Penner, Robert Jackson and ember-cli contributors", "main": "lib/cli/index.js", "bin": { "ember": "./bin/ember" }, "scripts": { "docs": "yuidoc", "lint": "eslint . --cache", "prepack": "yarn docs", "test": "node --unhandled-rejections=strict tests/runner", "test:all": "node --unhandled-rejections=strict tests/runner all", "test:cover": "nyc --all --reporter=text --reporter=lcov node tests/runner all", "test:debug": "node --unhandled-rejections=strict debug tests/runner", "test:slow": "node --unhandled-rejections=strict tests/runner slow" }, "dependencies": { "@babel/core": "^7.22.10", "@pnpm/find-workspace-dir": "^6.0.2", "broccoli": "^3.5.2", "broccoli-builder": "^0.18.14", "broccoli-concat": "^4.2.5", "broccoli-config-loader": "^1.0.1", "broccoli-config-replace": "^1.1.2", "broccoli-debug": "^0.6.5", "broccoli-funnel": "^3.0.8", "broccoli-funnel-reducer": "^1.0.0", "broccoli-merge-trees": "^4.2.0", "broccoli-middleware": "^2.1.1", "broccoli-slow-trees": "^3.1.0", "broccoli-source": "^3.0.1", "broccoli-stew": "^3.0.0", "calculate-cache-key-for-tree": "^2.0.0", "capture-exit": "^2.0.0", "chalk": "^4.1.2", "ci-info": "^3.8.0", "clean-base-url": "^1.0.0", "compression": "^1.7.4", "configstore": "^5.0.1", "console-ui": "^3.1.2", "core-object": "^3.1.5", "dag-map": "^2.0.2", "diff": "^5.1.0", "ember-cli-is-package-missing": "^1.0.0", "ember-cli-lodash-subset": "^2.0.1", "ember-cli-normalize-entity-name": "^1.0.0", "ember-cli-preprocess-registry": "^5.0.1", "ember-cli-string-utils": "^1.1.0", "ensure-posix-path": "^1.1.1", "execa": "^5.1.1", "exit": "^0.1.2", "express": "^4.18.1", "filesize": "^10.0.8", "find-up": "^5.0.0", "find-yarn-workspace-root": "^2.0.0", "fixturify-project": "^2.1.1", "fs-extra": "^11.1.1", "fs-tree-diff": "^2.0.1", "get-caller-file": "^2.0.5", "git-repo-info": "^2.1.1", "glob": "^8.1.0", "heimdalljs": "^0.2.6", "heimdalljs-fs-monitor": "^1.1.1", "heimdalljs-graph": "^1.0.0", "heimdalljs-logger": "^0.1.10", "http-proxy": "^1.18.1", "inflection": "^2.0.1", "inquirer": "^9.1.5", "is-git-url": "^1.0.0", "is-language-code": "^3.1.0", "isbinaryfile": "^5.0.0", "leek": "0.0.24", "lodash.template": "^4.5.0", "markdown-it": "^13.0.1", "markdown-it-terminal": "^0.4.0", "minimatch": "^7.4.3", "morgan": "^1.10.0", "nopt": "^3.0.6", "npm-package-arg": "^10.1.0", "os-locale": "^5.0.0", "p-defer": "^3.0.0", "portfinder": "^1.0.32", "promise-map-series": "^0.3.0", "promise.hash.helper": "^1.0.8", "quick-temp": "^0.1.8", "remove-types": "^1.0.0", "resolve": "^1.22.1", "resolve-package-path": "^4.0.3", "safe-stable-stringify": "^2.4.3", "sane": "^5.0.1", "semver": "^7.3.5", "silent-error": "^1.1.1", "sort-package-json": "^1.57.0", "symlink-or-copy": "^1.3.1", "temp": "0.9.4", "testem": "^3.10.1", "tiny-lr": "^2.0.0", "tree-sync": "^2.1.0", "uuid": "^9.0.0", "walk-sync": "^3.0.0", "watch-detector": "^1.0.2", "workerpool": "^6.4.0", "yam": "^1.0.0" }, "devDependencies": { "@octokit/rest": "^19.0.7", "broccoli-plugin": "^4.0.3", "broccoli-test-helper": "^2.0.0", "chai": "^4.3.7", "chai-as-promised": "^7.1.1", "chai-files": "^1.4.0", "chai-jest-snapshot": "^2.0.0", "ember-cli-blueprint-test-helpers": "^0.19.2", "ember-cli-internal-test-helpers": "^0.9.1", "eslint": "^8.44.0", "eslint-config-prettier": "^8.9.0", "eslint-plugin-chai-expect": "^3.0.0", "eslint-plugin-mocha": "^10.1.0", "eslint-plugin-n": "^16.0.1", "eslint-plugin-prettier": "^4.2.1", "fixturify": "^3.0.0", "jsdom": "^21.1.1", "latest-version": "^5.1.0", "mocha": "^10.0.0", "nock": "^13.3.0", "nyc": "^15.1.0", "prettier": "2.8.7", "release-it": "^15.10.0", "rimraf": "^3.0.2", "strip-ansi": "^6.0.0", "supertest": "^6.3.1", "testdouble": "^3.18.0", "tmp": "^0.2.1", "websocket": "^1.0.32", "which": "3.0.1", "yuidoc-ember-cli-theme": "^1.0.4", "yuidocjs": "0.10.2" }, "engines": { "node": ">= 16" }, "publishConfig": { "registry": "https://registry.npmjs.org" }, "release-it": { "git": { "tagName": "v${version}" }, "github": { "draft": true, "release": true, "tokenRef": "GITHUB_AUTH" } }, "trackingCode": "UA-49225444-1", "volta": { "node": "16.19.1", "yarn": "1.22.19" } } </ins>


ThomasMader = "Thomas Mader <thomas.mader@gmail.com>"; thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; timbertson = "Tim Cuthbertson <tim@gfxmonk.net>"; <ins> timokau = "Timo Kaufmann <timokau@zoho.com>"; </ins> titanous = "Jonathan Rudenberg <jonathan@titanous.com>"; tnias = "Philipp Bartsch <phil@grmr.de>"; tohl = "Tomas Hlavaty <tom@logand.com>";


}; url_preview_url_blacklist = mkOption { type = types.listOf types.str; <del> default = [ "127.0.0.0/8" "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16" "100.64.0.0/10" "169.254.0.0/16" ]; </del> <ins> default = []; </ins> description = '' Optional list of URL matches that the URL preview spider is denied from accessing.


patches = [ (substituteAll { src = ./libpq.patch; <del> libpq = "${postgresql.lib}/lib/libpq.so"; </del> <ins> libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; </ins> }) ];


<del> { lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }: </del> <ins> { lib , stdenv , fetchFromGitHub , pkg-config , blas , lapack , gfortran , enableAMPL ? stdenv.isLinux, libamplsolver }: </ins> assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; <del> version = "3.12.13"; </del> <ins> version = "3.14.5"; </ins> <del> src = fetchurl { url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; sha256 = "0kzf05aypx8q5mr3sciclk926ans0yi2d2chjdxxgpi3sza609dx"; </del> <ins> src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; sha256 = "sha256-eqOacZGuuGAjWMs2H6RntQ+WJmGTi+EqydHUQXEpY54="; </ins> }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; configureFlags = [ <del> "--with-blas-lib=-lblas" "--with-lapack-lib=-llapack" </del> <ins> "--with-asl-cflags=-I${libamplsolver}/include" "--with-asl-lflags=-lamplsolver" </ins> ]; <del> nativeBuildInputs = [ unzip gfortran ]; buildInputs = [ blas lapack ]; </del> <ins> nativeBuildInputs = [ pkg-config gfortran ]; buildInputs = [ blas lapack ] ++ lib.optionals enableAMPL [ libamplsolver ]; </ins> enableParallelBuilding = true;


"-DENABLE_TESTING=${enableIf doCheck}" "-DDISABLE_META_INTEGRATION_TESTS=ON" "-DTRAVIS_DISABLE_META_CPP=ON" <del> "-DPythonModular=${enableIf pythonSupport}" </del> <ins> "-DINTERFACE_PYTHON=${enableIf pythonSupport}" </ins> "-DOpenCV=${enableIf opencvSupport}" "-DUSE_SVMLIGHT=${enableIf withSvmLight}" ];


stdenv.mkDerivation rec { pname = "clojure"; <del> version = "1.10.3.855"; </del> <ins> version = "1.10.3.933"; </ins> src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; <del> sha256 = "sha256-y2PuOBRq5kZlTpPV8NwkWhspQKlNxwjl+k/Drwixk4Q="; </del> <ins> sha256 = "sha256-xsm0/HNWr8a/7iLQVC9TbUkASWvw/EI3bD0dMDhLZXA="; </ins> }; nativeBuildInputs = [


sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; <del> patches = [ ./fix-include-qt-headers.patch ]; </del> <ins> patches = [ ./fix-include-qt-headers.patch # Remove this patch when updating to 6.8.0 (fetchpatch { name = "backwards-compatibility-with-6.6.x.patch"; url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=4f9a20e3635f4f0957e0774588b1d9156e88a572"; hash = "sha256-B2jhLWopgaSF/rUXMZFPZArDUNojlBgn7kdVyQull+I="; stripLen = 2; }) ]; </ins> nativeBuildInputs = [ cmake


<ins> commit 1b0d9bcc5f5cd78b0bb1357d6a11da5d616ad26f Author: Wout Mertens <Wout.Mertens@gmail.com> Date:   Thu Jun 11 18:08:13 2020 +0200 fix segfault when using ECDSA keys. Author: Marc Deslauriers <marc.deslauriers@canonical.com> Bug-Ubuntu: https://bugs.launchpad.net/bugs/1869512 diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c index 5b13b30..5bf29cc 100644 --- a/ssh-ecdsa.c +++ b/ssh-ecdsa.c @@ -46,7 +46,7 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp, u_int len, dlen; Buffer b, bb; #if OPENSSL_VERSION_NUMBER >= 0x10100005L -	BIGNUM *r, *s; +	BIGNUM *r = NULL, *s = NULL; #endif if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) { @@ -137,20 +137,27 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen, /* parse signature */ if ((sig = ECDSA_SIG_new()) == NULL) -        pamsshagentauth_fatal("ssh_ecdsa_verify: DSA_SIG_new failed"); +        pamsshagentauth_fatal("ssh_ecdsa_verify: ECDSA_SIG_new failed"); pamsshagentauth_buffer_init(&b); pamsshagentauth_buffer_append(&b, sigblob, len); #if OPENSSL_VERSION_NUMBER < 0x10100005L if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) || (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1)) +        pamsshagentauth_fatal("ssh_ecdsa_verify:" +            "pamsshagentauth_buffer_get_bignum2_ret failed"); #else -    DSA_SIG_get0(sig, &r, &s); +    if ((r = BN_new()) == NULL) +        pamsshagentauth_fatal("ssh_ecdsa_verify: BN_new failed"); +    if ((s = BN_new()) == NULL) +        pamsshagentauth_fatal("ssh_ecdsa_verify: BN_new failed"); if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) || (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1)) -#endif pamsshagentauth_fatal("ssh_ecdsa_verify:" "pamsshagentauth_buffer_get_bignum2_ret failed"); +    if (ECDSA_SIG_set0(sig, r, s) != 1) +        pamsshagentauth_fatal("ssh_ecdsa_verify: ECDSA_SIG_set0 failed"); +#endif /* clean up */ memset(sigblob, 0, len); </ins>


denonavr = callPackage ../development/python-modules/denonavr { }; <ins> dep-logic = callPackage ../development/python-modules/dep-logic { }; </ins> dependency-injector = callPackage ../development/python-modules/dependency-injector { }; deploykit = callPackage ../development/python-modules/deploykit { };


, nodePackages, bash # Attributes inherit from specific versions <del> , version, src, meta, sourceRoot </del> <ins> , version, src, meta, sourceRoot, commandLineArgs </ins> , executableName, longName, shortName, pname, updateScript # sourceExecutableName is the name of the binary in the source archive, over # which we have no control


gotypist = callPackage ../games/gotypist { }; <del> heroic-unwrapped = callPackage ../games/heroic { }; </del> <ins> heroic-unwrapped = callPackage ../games/heroic { # Match the version used by the upstream package. electron = electron_24; }; </ins> heroic = callPackage ../games/heroic/fhsenv.nix { };


homepage = https://postgis.net/; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; <del> platforms = platforms.linux; </del> <ins> inherit (postgresql.meta) platforms; </ins> }; }


./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 = [