<del> { lib , stdenv , git , git-lfs , fetchurl , wrapGAppsHook3 , alsa-lib , at-spi2-atk , cairo , cups , dbus , expat , gdk-pixbuf , glib , gtk3 , mesa , nss , nspr , xorg , libdrm , libsecret , libxkbcommon , pango , systemd , hunspellDicts , useHunspell ? true , languages ? [ "en_US" ] , withNemoAction ? true , makeDesktopItem , copyDesktopItems , asar , python3 }: let pname = "pulsar"; version = "1.114.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; x86_64-linux.hash = "sha256-O//dowoMgQfS3hq088IKr5aJd5St9zpT/ypfuswnyv0="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; aarch64-linux.hash = "sha256-EzCTB1Ib9cTbslEdXPsS5gehHr1qd5v4iZgOqpxhUmA="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); newLibpath = lib.makeLibraryPath [ alsa-lib at-spi2-atk cairo cups dbus expat gdk-pixbuf glib gtk3 libsecret mesa nss nspr libdrm xorg.libX11 xorg.libxcb xorg.libXcomposite xorg.libXdamage xorg.libXext xorg.libXfixes xorg.libXrandr xorg.libxshmfence libxkbcommon xorg.libxkbfile pango stdenv.cc.cc.lib systemd ]; # Hunspell hunspellDirs = builtins.map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages; hunspellTargetDirs = "$out/opt/Pulsar/resources/app.asar.unpacked/node_modules/spellchecker/vendor/hunspell_dictionaries"; hunspellCopyCommands = lib.concatMapStringsSep "n" (lang: "cp -r ${lang}/* ${hunspellTargetDirs};") hunspellDirs; in stdenv.mkDerivation rec { inherit pname version; src = with sourcesPath; fetchurl { url = "https://github.com/pulsar-edit/pulsar/releases/download/v${version}/${tarname}"; inherit hash; }; patches = [ ./001-patch-wrapper.patch ]; nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems asar ]; buildInputs = [ gtk3 xorg.libxkbfile ]; dontBuild = true; dontConfigure = true; installPhase = '' runHook preInstall mkdir -p $out/opt/Pulsar mv * $out/opt/Pulsar runHook postInstall ''; preFixup = '' gappsWrapperArgs+=( # needed for gio executable to be able to delete files --prefix "PATH" : "${lib.makeBinPath [ glib ]}" ) '' + lib.optionalString useHunspell '' # On all platforms, we must inject our dictionnaries ${hunspellCopyCommands} ''; postFixup = '' opt=$out/opt/Pulsar # Patch the prebuilt binaries patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  --set-rpath "${newLibpath}:$opt"  --add-needed libffmpeg.so  --add-needed libxshmfence.so.1  --add-needed libxkbcommon.so.0  --add-needed libxkbfile.so.1  --add-needed libsecret-1.so.0  $opt/pulsar patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  --set-rpath "${newLibpath}"  $opt/resources/app/ppm/bin/node patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  $opt/resources/app.asar.unpacked/node_modules/symbol-provider-ctags/vendor/ctags-linux # Replace the bundled git with the one from nixpkgs dugite=$opt/resources/app.asar.unpacked/node_modules/dugite rm -f $dugite/git/bin/git ln -s ${git}/bin/git $dugite/git/bin/git # Not only do we need to replace the git binary itself, we also need to replace # all the symlinks in dugite/git/libexec/git-core. for file in "$dugite/git/libexec/git-core"/*; do if [ -x "$file" ] && file "$file" | grep -q "ELF"; then # Remove ELF executable rm "$file" # Get the corresponding filename in nixpkgs's git filename=$(basename "$file") git_executable="${git}/libexec/git-core/$filename" # Create symlink to $git_executable ln -s "$git_executable" "$file" echo "Replaced $file with symlink to $git_executable" fi done # Was symlinked in previous loop, but actually, nixpkgs has a separate package for git-lfs # Unlink to avoid a "File exists" error and relink correctly unlink $dugite/git/libexec/git-core/git-lfs ln -s ${git-lfs}/bin/git-lfs $dugite/git/libexec/git-core/git-lfs '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' # We have to patch a prebuilt binary in the asar archive # But asar complains because the node_gyp unpacked dependency uses a prebuilt Python3 itself rm $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3 ln -s ${python3.interpreter} $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3 '' + '' # Patch the bundled node executables find $opt -name "*.node" -exec patchelf --set-rpath "${newLibpath}:$opt" {} ; # Also patch the node executable for apm patchelf --set-rpath "${newLibpath}:$opt" $opt/resources/app/ppm/bin/node # The pre-packaged ASAR bundle comes with prebuild binaries, expecting libstdc++.so.6 asarBundle=$TMPDIR/asarbundle asar e $opt/resources/app.asar $asarBundle find $asarBundle -name "*.node" -exec patchelf --set-rpath "${newLibpath}:$opt" --add-needed libstdc++.so.6 {} ; unlink $asarBundle/node_modules/document-register-element/dre # Self referencing symlink, breaking asar rebundling asar p $asarBundle $opt/resources/app.asar rm -rf $asarBundle # We have patched the original wrapper, but now it needs the "PULSAR_PATH" env var mkdir -p $out/bin wrapProgram $opt/resources/pulsar.sh  --prefix "PULSAR_PATH" : "$opt/pulsar" ln -s $opt/resources/pulsar.sh $out/bin/pulsar ln -s $opt/resources/app/ppm/bin/apm $out/bin/ppm # Copy the icons mkdir -p $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/1024x1024/apps cp $opt/resources/pulsar.svg $out/share/icons/hicolor/scalable/apps/pulsar.svg cp $opt/resources/pulsar.png $out/share/icons/hicolor/1024x1024/apps/pulsar.png '' + lib.optionalString withNemoAction '' # Copy the nemo action file mkdir -p $out/share/nemo/actions cp ${./pulsar.nemo_action} $out/share/nemo/actions/pulsar.nemo_action ''; desktopItems = [ (makeDesktopItem { name = "Pulsar"; desktopName = "Pulsar"; exec = "pulsar"; icon = "pulsar"; comment = "A Community-led Hyper-Hackable Text Editor"; genericName = "Text Editor"; categories = [ "Development" "TextEditor" "Utility" ]; mimeTypes = [ "text/plain" ]; }) ]; passthru.updateScript = ./update.mjs; meta = with lib; { description = "A Community-led Hyper-Hackable Text Editor"; longDescription = '' A Community-led Hyper-Hackable Text Editor, Forked from Atom, built on Electron. Designed to be deeply customizable, but still approachable using the default configuration. ''; homepage = "https://github.com/pulsar-edit/pulsar"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ bryango ]; knownVulnerabilities = [ "CVE-2023-5217" "CVE-2022-21718" "CVE-2022-29247" "CVE-2022-29257" "CVE-2022-36077" "CVE-2023-29198" "CVE-2023-39956" ]; }; } </del>


patchPhase = ''patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c <ins> '' + stdenv.lib.optionalString (frei0r != null) '' substituteInPlace libavfilter/vf_frei0r.c  --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 substituteInPlace doc/filters.texi  --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 </ins> ''; configureFlags = [


inherit pname version; inherit src; <del> npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE="; </del> <ins> npmDepsHash = "sha256-7oh5bl5APAvzb/TxHMUP/saRWLwuP9xqGvn7/RDhFk8="; </ins> npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true;


qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; <del> qtwebengine = [ ] </del> <ins> qtwebengine = [ # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 (fetchpatch { name = "qtwebengine-bison-3.7-build.patch"; url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; stripLen = 1; extraPrefix = "src/3rdparty/"; }) ] </ins> ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ (fetchpatch {


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


enableParallelBuilding = true; <del> doCheck = !stdenv.isDarwin; </del> <ins> # Other versions of Julia pass the tests, but we are not sure why these fail. doCheck = false; </ins> checkTarget = "testall"; # Julia's tests require read/write access to $HOME preCheck = ''


my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd")); <del> if ($extraInitrd) { $initrd .= " " .$extraInitrdPath->path; </del> <ins> # Include second initrd with secrets if ($initrdSecrets) { # Get last element of path $initrd =~ //([^/]+)$/; my $initrdSecretsPath = "$bootPath/kernels/$1-secrets"; $initrd .= " $initrd-secrets"; my $oldUmask = umask; # Make sure initrd is not world readable (won't work if /boot is FAT) umask 0137; my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secretsn"; rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into placen"; umask $oldUmask; $copied{$initrdSecretsPath} = 1; </ins> } my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; # FIXME: $confName


<del> { lib, stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { version = "3.1.0"; pname = "dotty-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz"; sha256 = "9bsZ2FtIb6AvA3W3r2Vv0dPNicuYjMBz3X48z45Avv8="; }; propagatedBuildInputs = [ jre ncurses.dev ] ; nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out mv * $out ''; fixupPhase = '' bin_files=$(find $out/bin -type f ! -name common) for f in $bin_files ; do wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin' done ''; meta = with lib; { description = "Research platform for new language concepts and compiler technologies for Scala"; longDescription = '' Dotty is a platform to try out new language concepts and compiler technologies for Scala. The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals), and try to boil down Scala’s types into a smaller set of more fundamental constructs. The theory behind these constructs is researched in DOT, a calculus for dependent object types. ''; homepage = "http://dotty.epfl.ch/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [maintainers.karolchmist maintainers.virusdave]; }; } </del>


sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04"; }; <ins> propagatedBuildInputs = [ setuptools ]; </ins> patches = [ (fetchpatch { stripLen = 2;


}; nativeBuildInputs = [ makeWrapper unzip ]; <del> buildInputs = [ ant jre8 jdk8 gtk3 gsettings-desktop-schemas ]; </del> <ins> buildInputs = [ ant jdk gtk3 gsettings-desktop-schemas ]; </ins> postPatch = '' sed -i -e 's,../SweetHome3D,${applicationSrc},g' build.xml


- heterogeneous-list-literals - hetris - heukarya <del> - hevm </del> - HExcel - hexchat - hexif


aesop = callPackage ../applications/office/aesop { }; <ins> AusweisApp2 = libsForQt5.callPackage ../applications/misc/ausweisapp2 { }; </ins> avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; avrdudess = callPackage ../applications/misc/avrdudess { };


url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) <del> ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; </del> <ins> ] ++ optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-darwin-fix-failed-static-assertion.patch ]; </ins> qtwebkit = [ ./qtwebkit.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch


mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; <ins> mat2 = callPackage ../development/python-modules/mat2 { }; </ins> matchpy = callPackage ../development/python-modules/matchpy { }; mathlibtools = callPackage ../development/python-modules/mathlibtools { };


+            .arg(dest_path) +            .output(); +    } <ins> +    else if is_lib { +        let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") +            .arg("--set-rpath") +            .arg("@libPath@") +            .arg(dest_path) +            .output(); +    } </ins> +} + #[derive(Debug)]


#   registered in /etc/shells. The nix's bash is not in there when running #   cpu-x from nixpkgs. <del> stdenv.mkDerivation rec { </del> <ins> stdenv.mkDerivation (finalAttrs: { </ins> pname = "cpu-x"; version = "5.0.4"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; <del> rev = "v${version}"; sha256 = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; </del> <ins> rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-8jJP0gxH3B6qLrhKNa4P9ZfSjxaXTeBB1+UuadflLQo="; </ins> }; <del> nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm makeWrapper ]; </del> <ins> nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm ]; </ins> buildInputs = [ <del> gtk3 ncurses libcpuid pciutils procps vulkan-headers vulkan-loader glfw opencl-headers ocl-icd libXdmcp pcre util-linux libselinux libsepol libthai libdatrie libxkbcommon libepoxy dbus at-spi2-core </del> <ins> gtk3 gtkmm3 ncurses libcpuid pciutils procps vulkan-headers vulkan-loader glfw opencl-headers ocl-icd libXdmcp pcre util-linux libselinux libsepol libthai libdatrie libxkbcommon libepoxy dbus at-spi2-core </ins> libXtst ]; <del> postInstall = '' wrapProgram $out/bin/cpu-x  --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}  </del> <ins> preFixup = '' gappsWrapperArgs+=( --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} </ins> --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib <ins> ) </ins> ''; <del> meta = with lib; { </del> <ins> passthru = { tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; }; }; meta = { </ins> description = "Free software that gathers information on CPU, motherboard and more"; mainProgram = "cpu-x"; homepage = "https://thetumultuousunicornofdarkness.github.io/CPU-X"; <del> license = licenses.gpl3Plus; </del> <ins> license = lib.licenses.gpl3Plus; </ins> platforms = [ "x86_64-linux" ]; <del> maintainers = with maintainers; [ viraptor ]; </del> <ins> maintainers = with lib.maintainers; [ viraptor ]; </ins> }; <del> } </del> <ins> }) </ins>


config = mkMerge [ (mkIf cfgC.enable { <del> systemd.services."synergy-client" = { after = [ "network.target" ]; </del> <ins> systemd.user.services."synergy-client" = { after = [ "network.target" "graphical-session.target" ]; </ins> description = "Synergy client"; <del> wantedBy = optional cfgC.autoStart "multi-user.target"; </del> <ins> wantedBy = optional cfgC.autoStart "graphical-session.target"; </ins> path = [ pkgs.synergy ]; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}''; serviceConfig.Restart = "on-failure"; }; }) (mkIf cfgS.enable { <del> systemd.services."synergy-server" = { after = [ "network.target" ]; </del> <ins> systemd.user.services."synergy-server" = { after = [ "network.target" "graphical-session.target" ]; </ins> description = "Synergy server"; <del> wantedBy = optional cfgS.autoStart "multi-user.target"; </del> <ins> wantedBy = optional cfgS.autoStart "graphical-session.target"; </ins> path = [ pkgs.synergy ]; serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }''; serviceConfig.Restart = "on-failure";


owner = "named-data"; repo = "ndn-cxx"; rev = "${pname}-${version}"; <del> sha256 = "1lcaqc79n3d9sip7knddblba17sz18b0w7nlxmj3fz3lb3z9qd51"; </del> <ins> sha256 = "sha256-oTSc/lh0fDdk7dQeDhYKX5+gFl2t2Xlu1KkNmw7DitE="; </ins> }; nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; <del> buildInputs = [ boost openssl sqlite ]; </del> <ins> buildInputs = [ boost175 openssl sqlite ]; </ins> wafConfigureFlags = [ "--with-openssl=${openssl.dev}" <del> "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" </del> <ins> "--boost-includes=${boost175.dev}/include" "--boost-libs=${boost175.out}/lib" # "--with-tests" # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) </ins> ]; <ins> doCheck = false; # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) checkPhase = '' runHook preCheck LD_PRELOAD=build/ndn-cxx.so build/unit-tests runHook postCheck ''; </ins> meta = with lib; { homepage = "https://named-data.net/"; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";


</varlistentry> <varlistentry> <term> <del> GStreamer </del> <ins> GNOME platform </ins> </term> <listitem> <para> <del> Adds the GStreamer plugins subdirectory of each build input to the <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> or <envar>GST_PLUGIN_SYSTEM_PATH</envar> environment variable. </del> <ins> Hooks related to GNOME platform and related libraries like GLib, GTK and GStreamer are described in <xref linkend="sec-language-gnome" />. </ins> </para> </listitem> </varlistentry>


stdenv.mkDerivation rec { pname = "sqlite"; <del> version = "3.32.2"; </del> <ins> version = "3.32.3"; </ins> # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; <del> sha256 = "1130bcd70s2vlsq0d638pb5qrw9kwqvjswnp2dfypghx9hjz3gid"; </del> <ins> sha256 = "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3"; </ins> }; outputs = [ "bin" "dev" "out" ];


rustPlatform.buildRustPackage rec { pname = "eww"; <del> version = "0.6.0"; </del> <ins> version = "0.6.0-unstable-2024-04-26"; </ins> src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; <del> rev = "refs/tags/v${version}"; hash = "sha256-rzDnplFJNiHe+XbxbhZMEhPJMiJsmdVqtZxlxhzzpTk="; </del> <ins> # FIXME: change to a release tag once a new release is available # https://github.com/elkowar/eww/pull/1084 # using the revision to fix string truncation issue in eww config rev = "2c8811512460ce6cc75e021d8d081813647699dc"; hash = "sha256-eDOg5Ink3iWT/B1WpD9po5/UxS4DEaVO4NPIRyjSheM="; </ins> }; <del> cargoHash = "sha256-n9nd5E/VO+0BgkhrfQpeihlIkoVQRf6CMiPCK5opvvw="; </del> <ins> cargoHash = "sha256-ClnIW7HxbQcC85OyoMhBLFjVtdEUCOARuimfS4uRi+E="; </ins> <del> nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; </del> <ins> nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; </ins> buildInputs = [ gtk3


--replace '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"' ''; <ins> env = lib.optionalAttrs stdenv.cc.isClang { # Work around https://github.com/NixOS/nixpkgs/issues/166205. NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; </ins> # Some tests require networking doCheck = false;


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


{ path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; } ]; <ins> boot.loader.supportsInitrdSecrets = true; </ins> system.build.installBootLoader = let install-grub-pl = pkgs.substituteAll {


dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; <del> dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; dolphinEmuMaster = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { </del> <ins> dolphin-emu = callPackage ../misc/emulators/dolphin-emu { }; dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { </ins> inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; };


generic = { version, sha256, eol ? false, extraVulnerabilities ? [] <del> }: stdenv.mkDerivation rec { </del> <ins> }: let major = lib.versions.major version; in stdenv.mkDerivation rec { </ins> pname = "nextcloud"; inherit version;


in stdenv.mkDerivation rec { pname = "cups-filters"; <del> version = "1.25.0"; </del> <ins> version = "1.25.6"; </ins> src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; <del> sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1"; </del> <ins> sha256 = "1pgjk7j2p8m17pwynqd86hxgvz9lyb09ivx18lv6inmygij0pm4j"; </ins> }; nativeBuildInputs = [ pkgconfig makeWrapper ];


fullName = "European Union Public License 1.1"; }; <ins> eupl12 = spdx { spdxId = "EUPL-1.2"; fullName = "European Union Public License 1.2"; }; </ins> fdl12 = spdx { spdxId = "GFDL-1.2-only"; fullName = "GNU Free Documentation License v1.2 only";


# Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available <del> linuxPackages_latest = linuxPackages_5_8; </del> <ins> linuxPackages_latest = linuxPackages_5_7; </ins> linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels.


, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz <del> , libgccjit, targetPlatform, makeWrapper # native-comp params </del> <ins> , libgccjit, targetPlatform, makeWrapper, nukeReferences # native-comp params </ins> , systemd ? null , withX ? !stdenv.isDarwin , withNS ? stdenv.isDarwin


<ins> { stdenv, fetchFromGitHub }: let rev = "77686b3dfa20a34270cc52377c8e37c3a461e484"; version = stdenv.lib.strings.substring 0 7 rev; in stdenv.mkDerivation { name = "sbt-extras-${version}"; inherit version; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; sha256 = "1bhqigm0clv3i1gvn4gsllywcnwfsa73xvqp8m7pbvn8g7i2ws6x"; }; dontBuild = true; installPhase = '' mkdir -p $out/bin install bin/sbt $out/bin ''; meta = { description = "A more featureful runner for sbt, the simple/scala/standard build tool"; homepage = https://github.com/paulp/sbt-extras; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.unix; }; } </ins>


maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.all; mainProgram = "warp"; <ins> broken = stdenv.isDarwin; </ins> }; }


gmp libGL libGLU <ins> libSM </ins> mpfr proj python


ln -sf '${file}' "${local}" '') rules} <del> if [ ! -f /etc/opensnitch-system-fw.json ]; then </del> <ins> if [ ! -f /etc/opensnitchd/system-fw.json ]; then </ins> cp "${pkgs.opensnitch}/etc/opensnitchd/system-fw.json" "/etc/opensnitchd/system-fw.json" fi '');


<ins> { stdenv , lib , fetchFromGitHub , installShellFiles , binutils-unwrapped , systemd }: stdenv.mkDerivation rec { pname = "beefi"; version = "0.1.1"; src = fetchFromGitHub { owner = "jfeick"; repo = "beefi"; rev = version; sha256 = "1180avalbw414q1gnfqdgc9zg3k9y0401kw9qvcn51qph81d04v5"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ binutils-unwrapped systemd ]; patchPhase = '' substituteInPlace beefi  --replace objcopy ${binutils-unwrapped}/bin/objcopy  --replace /usr/lib/systemd ${systemd}/lib/systemd ''; installPhase = '' install -Dm755 beefi $out/bin/beefi installManPage beefi.1 ''; meta = with lib; { description = "A small script to create bootable EFISTUB kernel images"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ tu-maurice ]; homepage = "https://github.com/jfeick/beefi"; }; } </ins>


''; }) ]; <del> services.postfix = { </del> <ins> services.postfix = lib.mkIf cfg.enablePostfix { </ins> recipientDelimiter = "+";         # bake recipient addresses in mail envelopes via VERP config = { owner_request_special = "no";   # Mailman handles -owner addresses on its own


config.nix.package ] ++ cfg.extraPackages; <del> serviceConfig = rec { </del> <ins> serviceConfig = { </ins> ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service"; # Does the following, sequentially:


<ins> { lib , stdenv , fetchFromGitHub , meson , ninja , pkg-config , wrapGAppsHook , desktop-file-utils , appstream-glib , python3Packages , glib , gtk3 , libhandy , gobject-introspection , gst_all_1 }: python3Packages.buildPythonApplication rec { pname = "blanket"; version = "0.5.0"; src = fetchFromGitHub { owner = "rafaelmardojai"; repo = "blanket"; rev = version; sha256 = "00i821zqfbigxmc709322r16z75qsw4rg23yhv35gza9sl65bzkg"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook desktop-file-utils appstream-glib ]; buildInputs = [ glib gtk3 libhandy gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; propagatedBuildInputs = with python3Packages; [ pygobject3 ]; # Broken with gobject-introspection setup hook # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; format = "other"; postPatch = '' patchShebangs build-aux/meson/postinstall.py ''; meta = with lib; { homepage = "https://github.com/rafaelmardojai/blanket"; description = "Listen to different sounds"; maintainers = with maintainers; [ onny ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; } </ins>


<del> diff --git a/Makefile b/Makefile index d6b9dc1..ce7c493 100644 --- a/Makefile +++ b/Makefile @@ -601,7 +601,7 @@ install-localstatedir: endif -install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir +install: all $(if $(BUILD_DOCS),install-doc) install-datadir ifneq ($(TOOLS),) $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) endif </del>


linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened); <ins> linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened); </ins> linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);


echo "unsupported interpreter directive "$oldInterpreterLine" (set dontPatchShebangs=1 and handle shebang patching yourself)" exit 1 fi <del> newPath="$(command -v "$arg0" || true)" </del> <ins> newPath="$(PATH="${!pathName}" command -v "$arg0" || true)" </ins> else if [ "$oldPath" = "" ]; then # If no interpreter is specified linux will use /bin/sh. Set # oldpath="/bin/sh" so that we get /nix/store/.../sh. oldPath="/bin/sh" fi <del> newPath="$(command -v "$(basename "$oldPath")" || true)" </del> <ins> newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)" </ins> args="$arg0 $args" fi


<del> { lib, python3, fetchFromGitHub, git, pkg-config }: </del> <ins> { lib, stdenv, python3, fetchFromGitHub, git, pkg-config, fetchpatch }: </ins> # Note: # Conan has specific dependency demands; check


default = null; defaultText = literalExpression "username"; }; <ins> workDir = mkOption { type = with types; nullOr str; description = lib.mdDoc '' Working directory, available as `$GITHUB_WORKSPACE` during workflow runs and used as a default for [repository checkouts](https://github.com/actions/checkout). The service cleans this directory on every service start. A value of `null` will default to the systemd `RuntimeDirectory`. ''; default = null; }; </ins> }


inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; <del> julia_15 = callPackage ../development/compilers/julia/1.5.nix { </del> <ins> julia_15 = callPackage ../development/compilers/julia/1.5.nix { </ins> inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia_1 = julia_10; <del> julia = julia_1; </del> <ins> julia = julia_15; </ins> jwasm =  callPackage ../development/compilers/jwasm { };


, cmake , qttools , wrapQtAppsHook <ins> , qtbase , qtwayland </ins> , qtsvg }:


<del> { lib , stdenvNoCC , fetchzip , fetchFromGitHub , butler , electron , steam-run , makeWrapper , copyDesktopItems , makeDesktopItem </del> <ins> { lib, stdenvNoCC, fetchzip, fetchFromGitHub, electron, steam-run, makeWrapper, copyDesktopItems, makeDesktopItem, </ins> }: <del> stdenvNoCC.mkDerivation rec { pname = "itch"; version = "26.1.3"; # TODO: Using kitch instead of itch, revert when possible src = fetchzip { url = "https://broth.itch.ovh/kitch/linux-amd64/${version}/archive/default#.zip"; </del> <ins> let version = "26.1.9"; butler = fetchzip { url = "https://broth.itch.zone/butler/linux-amd64/15.21.0/butler.zip"; </ins> stripRoot = false; <del> hash = "sha256-FHwbzLPMzIpyg6KyYTq6/rSNRH76dytwb9D5f9vNKkU="; </del> <ins> hash = "sha256-jHni/5qf7xST6RRonP2EW8fJ6647jobzrnHe8VMx4IA="; </ins> }; itch-setup = fetchzip {


va_end (ap); return res; <ins> diff --git a/src/builder-source-archive.c b/src/builder-source-archive.c index 3c694e57..0de62318 100644 </ins> --- a/src/builder-source-archive.c +++ b/src/builder-source-archive.c @@ -443,7 +443,7 @@ tar (GFile   *dir,


buildInputs = [ openssl zstd ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ <del> Foundation </del> ( # Pull a header that contains a definition of proc_pid_rusage(). # (We pick just that one because using the other headers from `sdk` is not


# Symlink to bin mkdir -p $out/bin <del> ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop </del> <ins> ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop-unwrapped </ins> runHook postInstall ''; <ins> # Required for $SQLCIPHER_LIB which contains "/build/" inside the path: noAuditTmpdir = true; </ins> preFixup = '' <ins> export SQLCIPHER_LIB="$out/lib/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node" test -x "$SQLCIPHER_LIB" # To ensure the location hasn't changed </ins> gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" <ins> --prefix LD_PRELOAD : "$SQLCIPHER_LIB" </ins> ${customLanguageWrapperArgs} )


pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}"; <del> sha256 = "12ycz7iasrc9p9c6zr95l6llyji3za43gsx8cmr2kjfiv23bcrv2"; </del> <ins> sha256 = "sha256-sSz/owGdCMB5b9+cAWvLkrfFcIIq5665Xopd4JKv1G4="; </ins> }; patches = getPatches ./patches; };


outputs = [ "out" "dev" "man" ]; <del> patches = [ (substituteAll { src = ./fix-paths.patch; zenity = gnome.zenity; }) ]; </del> src = fetchFromGitHub { owner = "linuxmint"; repo = pname;


rapidfuzz-cpp ]; <ins> NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ "-fno-lto"  # work around https://github.com/NixOS/nixpkgs/issues/19098 ]; </ins> propagatedBuildInputs = [ rapidfuzz ];


pathtools = callPackage ../development/python-modules/pathtools { }; <ins> pathvalidate = callPackage ../development/python-modules/pathvalidate { }; </ins> patiencediff = callPackage ../development/python-modules/patiencediff { }; patool = callPackage ../development/python-modules/patool { };


<ins> { lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "libamplsolver"; version = "20211109"; src = fetchurl { url = "https://ampl.com/netlib/ampl/solvers.tgz"; sha256 = "sha256-LVmScuIvxmZzywPSBl9T9YcUBJP7UFAa3eWs9r4q3JM="; }; patches = [ # Debian provides a patch to build a shared library (fetchpatch { url = "https://sources.debian.org/data/main/liba/libamplsolver/0~20190702-2/debian/patches/fix-makefile-shared-lib.patch"; sha256 = "sha256-96qwj3fLugzbsfxguKMce13cUo7XGC4VUE7xKcJs42Y="; }) ]; installPhase = '' runHook preInstall pushd sys.`uname -m`.`uname -s` install -D -m 0644 *.h -t $out/include install -D -m 0644 *.so* -t $out/lib install -D -m 0644 *.a -t $out/lib popd runHook postInstall ''; meta = with lib; { description = "A library of routines that help solvers work with AMPL"; homepage = "https://ampl.com/netlib/ampl/"; license = [ licenses.mit ]; platforms = platforms.linux; maintainers = with maintainers; [ aanderse ]; }; } </ins>


src = fetchurl { url = "https://www2.ati.com/drivers/linux/radeon-crimson-15.12-15.302-151217a-297685e.zip"; <del> sha256 = "0n0ynqmjkjp5dl5q07as7ps3rlyyn63hq4mlwgd7c7v82ky2skvh"; curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux+x86_64"; </del> <ins> sha256 = "704f2dfc14681f76dae3b4120c87b1ded33cf43d5a1d800b6de5ca292bb61e58"; curlOpts = "--referer https://www.amd.com/en/support"; </ins> }; hardeningDisable = [ "pic" "format" ];


(mkFlag true                      "generate-man-pages") ]; <ins> passthru.tests = { nixos-rsyslogd = nixosTests.rsyslogd; }; </ins> meta = { homepage = https://www.rsyslog.com/; description = "Enhanced syslog implementation";


sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; <ins> # First test: RuntimeWarning: Mean of empty slice. # Second: SyntaxError: invalid syntax. Due to wrapper? # Third: test checks permissions prePatch = '' substituteInPlace scipy/stats/tests/test_stats.py --replace "test_chisquare_masked_arrays" "remove_this_one" rm scipy/linalg/tests/test_lapack.py substituteInPlace scipy/weave/tests/test_catalog.py --replace "test_user" "remove_this_one" ''; </ins> inherit (support) preBuild checkPhase; <ins> patches = [../development/python-modules/scipy-0.16.1-decorator-fix.patch]; </ins> setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; meta = {


<ins> <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-custom-packages"> <title>Adding Custom Packages</title> <para> It’s possible that a package you need is not available in NixOS. In that case, you can do two things. First, you can clone the Nixpkgs repository, add the package to your clone, and (optionally) submit a patch or pull request to have it accepted into the main Nixpkgs repository. This is described in detail in the <link xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. In short, you clone Nixpkgs: </para> <programlisting> $ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs </programlisting> <para> Then you write and test the package as described in the Nixpkgs manual. Finally, you add it to <xref linkend="opt-environment.systemPackages" />, e.g. </para> <programlisting language="bash"> environment.systemPackages = [ pkgs.my-package ]; </programlisting> <para> and you run <literal>nixos-rebuild</literal>, specifying your own Nixpkgs tree: </para> <programlisting> # nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs </programlisting> <para> The second possibility is to add the package outside of the Nixpkgs tree. For instance, here is how you specify a build of the <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link> package directly in <literal>configuration.nix</literal>: </para> <programlisting language="bash"> environment.systemPackages = let my-hello = with pkgs; stdenv.mkDerivation rec { name = "hello-2.8"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; }; }; in [ my-hello ]; </programlisting> <para> Of course, you can also move the definition of <literal>my-hello</literal> into a separate Nix expression, e.g. </para> <programlisting language="bash"> environment.systemPackages = [ (import ./my-hello.nix) ]; </programlisting> <para> where <literal>my-hello.nix</literal> contains: </para> <programlisting language="bash"> with import <nixpkgs> {}; # bring all of Nixpkgs into scope stdenv.mkDerivation rec { name = "hello-2.8"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; }; } </programlisting> <para> This allows testing the package easily: </para> <programlisting> $ nix-build my-hello.nix $ ./result/bin/hello Hello, world! </programlisting> </section> </ins>


<del> { lib, buildFHSUserEnv, steam </del> <ins> { stdenv, lib, writeScript, buildFHSUserEnv, steam , steam-runtime, steam-runtime-i686 ? null </ins> , withJava ? false , withPrimus ? false , nativeOnly ? false


}; in buildPythonPackage ( rec { name = "numpy-${version}"; <del> version = "1.10.1"; </del> <ins> version = "1.10.2"; </ins> src = pkgs.fetchurl { url = "mirror://sourceforge/numpy/${name}.tar.gz"; <del> sha256 = "8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858"; </del> <ins> sha256 = "23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9"; </ins> }; disabled = isPyPy;  # WIP


buildInputs = [ qtbase <ins> rtaudio_6 </ins> rtmidi ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ qt5compat <del> ] ++ rtaudio.buildInputs; </del> <ins> ]; </ins> qmakeFlags = [ <del> # we don't have RtAudio 6 yet: https://github.com/NixOS/nixpkgs/pull/245075 # "CONFIG+=system_rtaudio" </del> <ins> "CONFIG+=system_rtaudio" </ins> "CONFIG+=system_rtmidi" ];


warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1" <ins> # flags to pass to bootctl install/update bootctl_flags = [] if "@canTouchEfiVariables@" != "1": bootctl_flags.append("--no-variables") if "@graceful@" == "1": bootctl_flags.append("--graceful") </ins> if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1": # bootctl uses fopen() with modes "wxe" and fails if the file exists. if os.path.exists("@efiSysMountPoint@/loader/loader.conf"): os.unlink("@efiSysMountPoint@/loader/loader.conf") <del> flags = [] if "@canTouchEfiVariables@" != "1": flags.append("--no-variables") if "@graceful@" == "1": flags.append("--graceful") subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + flags + ["install"]) </del> <ins> subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["install"]) </ins> else: # Update bootloader to latest if needed available_out = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2]


{ stdenv, fetchFromGitHub , autoreconfHook, docbook2x, pkgconfig , gtk3, dconf, gobject-introspection <del> , ibus, python3 }: </del> <ins> , ibus, python3, wrapGAppsHook }: </ins> stdenv.mkDerivation rec { <del> name = "ibus-table-${version}"; </del> <ins> pname = "ibus-table"; </ins> version = "1.9.21"; src = fetchFromGitHub {


sha256 = sha256; }; <del> includeScript = pkgs.writeText "include.php" '' </del> <ins> prePatch = '' dos2unix ./rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php ''; patches = [ ./fix-cve-2022-29360.patch ]; postPatch = '' unix2dos ./rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php ''; includeScript = writeText "include.php" '' </ins> <?php /**


{ lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; <del> version = "5.11.0"; name = "${pname}-${version}"; </del> <ins> version = "5.12.1"; </ins> src = fetchurl { <del> name = "${name}.AppImage"; </del> <ins> name = "${pname}-${version}.AppImage"; </ins> url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; <del> hash = "sha256-Nj6S53b4w84qppkGB7lMpJhJlxifaD4acPryuZxY7cM="; </del> <ins> hash = "sha256-ugnJcSFgEEPJ9qxqmRGgW1fraE4E/HbbxpK/00TXPmw="; </ins> }; udevRules = fetchurl {


in stdenv.mkDerivation rec { <del> srcVersion = "apr24a"; version = "20240401_a"; </del> <ins> srcVersion = "sep24a"; version = "20240901_a"; </ins> pname = "gildas"; src = fetchurl {


LUA_PATH  = "${lgi}/share/lua/${lua.luaversion}/?.lua;;"; postInstall = '' <del> # Don't use wrapProgram or or the wrapper will duplicate the --search </del> <ins> # Don't use wrapProgram or the wrapper will duplicate the --search </ins> # arguments every restart mv "$out/bin/awesome" "$out/bin/.awesome-wrapped" makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome"


++ cfg.sessionPath; # Fonts. <del> fonts.packages = mkDefault [ </del> <ins> fonts.packages = [ </ins> pkgs.noto-fonts pkgs.hack-font ];


++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.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 = "1c449jgm1vx9g4kv82bxmvlgrwb8f6kwkl0gqmjlmhf7f4hjy2nr"; }); </del> <ins> # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; </ins> javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at


rustPlatform.buildRustPackage rec { pname = "fido2luks"; <del> version = "0.2.20"; </del> <ins> version = "0.2.21"; </ins> src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; <del> sha256 = "04gl7wn38f42mapmkf026rya668vvhm03yi8iqnz31xgggbr2irm"; </del> <ins> sha256 = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o="; </ins> }; <del> cargoPatches = [ #https://github.com/shimunn/fido2luks/pull/50 (fetchpatch { name = "libcryptsetup-rs.patch"; url = "https://github.com/shimunn/fido2luks/commit/c87a9bbb4cbbe90be7385d4bc2946716c593b91d.diff"; sha256 = "2IWz9gcEbXhHlz7VWoJNBZfwnJm/J3RRuXg91xH9Pl4="; }) ]; </del> <ins> nativeBuildInputs = [ pkg-config clang ]; </ins> buildInputs = [ cryptsetup ]; <del> nativeBuildInputs = [ pkg-config clang ]; </del> configurePhase = '' export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; <del> cargoSha256 = "U/2dAmFmW6rQvojaKSDdO+/WzajBJmhOZWvzwdiYBm0="; </del> <ins> cargoSha256 = "sha256-MPji87jYJjYtDAXO+v/Z4XRtCKo+ftsNvmlBrM9iMTk="; </ins> meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; homepage = "https://github.com/shimunn/fido2luks"; <del> license = licenses.gpl3; </del> <ins> license = licenses.mpl20; </ins> maintainers = with maintainers; [ prusnak mmahut ]; platforms = platforms.linux; };


environment.systemPackages = [ pkgs.curl ]; }; traefik = { config, pkgs, ... }: { <del> docker-containers.nginx = { extraDockerOptions = [ </del> <ins> virtualisation.oci-containers.containers.nginx = { extraOptions = [ </ins> "-l" "traefik.enable=true" "-l" "traefik.http.routers.nginx.entrypoints=web" "-l" "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)"


makeFlags = let arch = head (splitString "-" stdenv.system); <del> march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} </del> <ins> march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; aarch64 = "armv8-a"; }.${arch} </ins> or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better <del> cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} </del> <ins> cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch} </ins> or (throw "unsupported architecture: ${arch}"); <del> # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM # https://github.com/JuliaLang/julia/tree/master/deps/patches </del> in [ "ARCH=${arch}" "MARCH=${march}"


{ lib <del> , stdenv , fetchFromGitea </del> , acl , attr , autoreconfHook <ins> , bzip2 , fetchFromGitea </ins> , libburn <ins> , libcdio , libiconv </ins> , libisofs , pkg-config <ins> , readline , stdenv </ins> , zlib }:


sha256 = "sha256-b9cBn5Nv+IxB58gi9G8QtRvXLWZZePZYZIPedbMMNr8="; }; <del> buildInputs = [ iptables-legacy libuuid openssl ]; </del> <ins> buildInputs = [ iptables-legacy libuuid openssl ] ++ lib.optionals (firewall == "nftables") [ libmnl libnftnl ]; </ins> nativeBuildInputs= [ pkg-config makeWrapper ]; # ./configure is not a standard configure file, errors with: # Option not recognized : --prefix= dontAddPrefix = true; <ins> configureFlags = [ "--firewall=${firewall}" # allow using various config options "--ipv6" "--leasefile" "--regex" "--vendorcfg" # hardening "--portinuse" ]; </ins> installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; <del> postFixup = '' for script in $out/etc/miniupnpd/ip{,6}tables_{init,removeall}.sh do wrapProgram $script --set PATH '${scriptBinEnv}:$PATH' done ''; </del> <ins> postFixup = { # Ideally we'd prefer using system's config.firewall.package here for iptables, # however for some reason switching --prefix to --suffix breaks the script iptables = '' for script in $out/etc/miniupnpd/ip{,6}tables_{init,removeall}.sh do wrapProgram $script --prefix PATH : '${scriptBinEnv}:$PATH' done ''; nftables = '' for script in $out/etc/miniupnpd/nft_{delete_chain,flush,init,removeall}.sh do wrapProgram $script --suffix PATH : '${scriptBinEnv}:$PATH' done ''; }.${firewall}; </ins> passthru.tests = { bittorrent-integration = nixosTests.bittorrent;


}; buildInputs = lib.optional pulseSupport libpulseaudio <del> ++ lib.optional jackSupport libjack2 ++ lib.optional alsaSupport alsa-lib; </del> <ins> ++ lib.optionals jackSupport [ libjack2 soxr ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pcapSupport libpcap; </ins> nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPULSEAUDIO_ENABLE=${if pulseSupport then "ON" else "OFF"}" "-DALSA_ENABLE=${if alsaSupport then "ON" else "OFF"}" "-DJACK_ENABLE=${if jackSupport then "ON" else "OFF"}" <ins> "-DPCAP_ENABLE=${if pcapSupport then "ON" else "OFF"}" </ins> ]; cmakeDir = "../Receivers/unix";


<ins> { buildPythonPackage, fetchFromGitHub, fetchpatch, lib, pythonOlder , clang_7, python2 , graphviz, matplotlib, numpy, pandas, plotly, scipy, six , withCuda ? false, cudatoolkit }: buildPythonPackage rec { pname = "catboost"; version = "0.24.4"; disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; rev = "v${version}"; sha256 = "sha256-pzmwEiKziB4ldnKgeCsP2HdnisX8sOkLssAzNfcSEx8="; }; nativeBuildInputs = [ clang_7 python2 ]; propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ] ++ lib.optional withCuda [ cudatoolkit ]; patches = [ ./nix-support.patch (fetchpatch { name = "format.patch"; url = "https://github.com/catboost/catboost/pull/1528/commits/a692ba42e5c0f62e5da82b2f6fccfa77deb3419c.patch"; sha256 = "sha256-fNGucHxsSDFRLk3hFH7rm+zzTdDpY9/QjRs8K+AzVvo="; }) ]; preBuild = '' cd catboost/python-package ''; setupPyBuildFlags = [ "--with-ymake=no" ]; CUDA_ROOT = lib.optional withCuda cudatoolkit; enableParallelBuilding = true; # Tests use custom "ya" tool, not yet supported. dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "catboost" ]; meta = with lib; { description = "High-performance library for gradient boosting on decision trees."; longDescription = '' A fast, scalable, high performance Gradient Boosting on Decision Trees library, used for ranking, classification, regression and other machine learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. ''; license = licenses.asl20; platforms = [ "x86_64-linux" ]; homepage = "https://catboost.ai"; maintainers = with maintainers; [ PlushBeaver ]; }; } </ins>


dae = callPackage ../tools/networking/dae { }; <ins> darling = callPackage ../applications/emulators/darling { }; </ins> databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };


<ins> {stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { name = "jbig2enc-0.28"; src = fetchurl { url = http://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz; sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; }; propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; # This is necessary, because the resulting library has # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib # in its rpath, which means that patchelf --shrink-rpath removes # the /nix/store one.  By cleaning up before fixup, we ensure that # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. preFixup = '' make clean ''; } </ins>


, hello # Overridable configurations , enableNvidiaContainerCli ? true <ins> # --nvccli currently requires extra privileges: # https://github.com/apptainer/apptainer/issues/1893#issuecomment-1881240800 , forceNvcCli ? false </ins> # Compile with seccomp support # SingularityCE 3.10.0 and above requires explicit --without-seccomp when libseccomp is not available. , enableSeccomp ? true


version = "11"; }; <ins> mathmod = libsForQt5.callPackage ../applications/science/math/mathmod { }; </ins> metis = callPackage ../development/libraries/science/math/metis { }; nauty = callPackage ../applications/science/math/nauty { };


sha256 = "sha256-Hi9d5IF09QXeAlp9HnzwG73ZQiyoq5RReCvwDuF4YCw="; }; <ins> patches = [ # Fix tests for Ghostscript 9.56 # Remove after v0.1.3 has been released (fetchpatch { url = "https://github.com/CourtBouillon/pydyf/commit/d4c34823f1d15368753c9c26f7acc7a24fc2d979.patch"; sha256 = "sha256-2hHZW/q5CbStbpSJYbm3b23qKXANEb5jbPGQ83uHC+Q="; }) ]; </ins> postPatch = '' substituteInPlace pyproject.toml  --replace "--isort --flake8 --cov --no-cov-on-fail" ""


--add-flags "--enable-preview"  --add-flags "--class-path '$out/share/cryptomator/libs/*'"  --add-flags "--module-path '$out/share/cryptomator/mods'"  <del> --add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'"  --add-flags "-Dcryptomator.pluginDir='~/.local/share/Cryptomator/plugins'"  --add-flags "-Dcryptomator.settingsPath='~/.config/Cryptomator/settings.json'"  --add-flags "-Dcryptomator.ipcSocketPath='~/.config/Cryptomator/ipc.socket'"  --add-flags "-Dcryptomator.mountPointsDir='~/.local/share/Cryptomator/mnt'"  </del> <ins> --add-flags "-Dfile.encoding='utf-8'"  --add-flags "-Dcryptomator.logDir='@{userhome}/.local/share/Cryptomator/logs'"  --add-flags "-Dcryptomator.pluginDir='@{userhome}/.local/share/Cryptomator/plugins'"  --add-flags "-Dcryptomator.settingsPath='@{userhome}/.config/Cryptomator/settings.json'"  --add-flags "-Dcryptomator.p12Path='@{userhome}/.config/Cryptomator/key.p12'"  --add-flags "-Dcryptomator.ipcSocketPath='@{userhome}/.config/Cryptomator/ipc.socket'"  --add-flags "-Dcryptomator.mountPointsDir='@{userhome}/.local/share/Cryptomator/mnt'"  </ins> --add-flags "-Dcryptomator.showTrayIcon=false"  --add-flags "-Dcryptomator.buildNumber='nix'"  --add-flags "-Dcryptomator.appVersion='${version}'"


preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" <del> --add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" </del> <ins> # Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043 #--add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" </ins> --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} )


<ins> { 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.2"; 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"; hash = "sha256-idOFt60MlspB8Bm9HbLAhd/F1zhkHSVmdTxvCsgjGvk="; } 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 = { description = "GUI for MongoDB"; maintainers = with lib.maintainers; [ bryanasdev000 ]; homepage = "https://github.com/mongodb-js/compass"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.sspl; platforms = [ "x86_64-linux" ]; mainProgram = "mongodb-compass"; }; } </ins>


rm -rf $out/include rm -rf $out/lib/*.a mv $out/bin/chat $out/bin/${finalAttrs.meta.mainProgram} <ins> install -D ${finalAttrs.embed_model} $out/resources/nomic-embed-text-v1.5.f16.gguf </ins> install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop <del> install -m 444 -D $src/gpt4all-chat/icons/logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg </del> <ins> install -m 444 -D $src/gpt4all-chat/icons/nomic_logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg </ins> substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop  --replace-fail 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}' '';


inherit (python2Packages) mutagen python wrapPython; }; <ins> dsp = callPackage ../tools/audio/dsp { }; </ins> dirdiff = callPackage ../tools/text/dirdiff { tcl = tcl-8_5; tk = tk-8_5;


<ins> { lib , buildPythonPackage , fetchFromGitHub , pythonOlder , setuptools , setuptools-scm , libxcrypt , numpy , qt6 , qtpy , pyqt6 , pytestCheckHook , pytest-cov }: buildPythonPackage rec { pname = "echo"; version = "0.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "glue-viz"; repo = pname; rev = "v${version}"; sha256 = "sha256-0FmUA7kOFSRZXwbj8d7asujBPOjE2pFhu6TDNSGD4r0="; }; nativeBuildInputs = [ setuptools setuptools-scm qt6.wrapQtAppsHook ]; buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; propagatedBuildInputs = [ qt6.qtconnectivity qt6.qtbase qt6.qttools pyqt6 numpy qtpy ]; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; # collecting ... qt.qpa.xcb: could not connect to display # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. doCheck = false; nativeCheckInputs = [ pytestCheckHook pytest-cov ]; pythonImportsCheck = [ "echo" ]; meta = with lib; { homepage = "https://github.com/glue-viz/echo"; description = "Callback Properties in Python"; license = licenses.mit; maintainers = with maintainers; [ ifurther ]; }; } </ins>


"--outfile", pubcert ) except: <del> rmtree(basedir) </del> <ins> rmtree(userdir) </ins> raise


pushover-complete = callPackage ../development/python-modules/pushover-complete { }; <ins> pvextractor = callPackage ../development/python-modules/pvextractor { }; </ins> pvlib = callPackage ../development/python-modules/pvlib { }; pvo = callPackage ../development/python-modules/pvo { };


<ins> { gnome3, fetchFromGitHub, autoconf, automake, gtk_doc, gettext, libtool, gperf }: gnome3.vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; version = "0.46.1.a"; src = fetchFromGitHub { owner = "thestinger"; repo = "vte-ng"; rev = version; sha256 = "125fpibid1liz50d7vbxy71pnm8b01x90xnkr4z3419b90lybr0a"; }; # The patches apply the changes from https://github.com/GNOME/vte/pull/7 and # can be removed once the commits are merged into vte-ng. patches = [ ./fix_g_test_init_calls.patch ./fix_vteseq_n_lookup_declaration.patch ]; preConfigure = oldAttrs.preConfigure + "; ./autogen.sh"; nativeBuildInputs = [ gtk_doc autoconf automake gettext libtool ]; buildInputs = oldAttrs.buildInputs ++ [ gperf ]; }) </ins>


```ShellSession $ cd /path/to/nixpkgs/doc $ nix-shell <del> [nix-shell]$ make $makeFlags </del> <ins> [nix-shell]$ make </ins> ``` If you experience problems, run `make debug` to help understand the docbook errors.


configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" <ins> ] ++ optionals withCloud [ "--enable-cloud" "--with-aclk-ng" </ins> ]; postFixup = ''


grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g" ''; <del> nativeBuildInputs = [ makeWrapper python3 jdk11 ant watchman ]; </del> <ins> nativeBuildInputs = [ makeWrapper python3 jdk8 ant watchman ]; </ins> buildPhase = '' # Set correct version, see https://github.com/facebook/buck/issues/2607


<del> { lib , stdenv , fetchFromGitHub , alsa-lib , cmake , ffmpeg , fribidi , game-music-emu , libXdmcp , libXv , libass , libcddb , libcdio , libpulseaudio , libsidplayfp , libva , libxcb , pkg-config , qtbase , qttools , taglib , vulkan-headers , vulkan-tools , wrapQtAppsHook }: stdenv.mkDerivation (finalAttrs: { pname = "qmplay2"; version = "24.04.07"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = finalAttrs.version; fetchSubmodules = true; hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ alsa-lib ffmpeg fribidi game-music-emu libXdmcp libXv libass libcddb libcdio libpulseaudio libsidplayfp libva libxcb qtbase qttools taglib vulkan-headers vulkan-tools ]; postInstall = '' # Because we think it is better to use only lowercase letters! ln -s $out/bin/QMPlay2 $out/bin/qmplay2 ''; 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, libmodplug (including J2B and SFX). It also supports Audio CD, raw files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3 browser. ''; changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ AndersonTorres kashw2 ]; platforms = lib.platforms.linux; }; }) </del>


<del> { lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2 , libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsa-lib }: </del> <ins> { lib , stdenv , fetchurl , SDL2 , SDL2_net , alsa-lib , flac , freeglut , libGL , libGLU , libX11 , libcdio , libjack2 , libsamplerate , libsndfile , pkg-config , zlib }: </ins> stdenv.mkDerivation rec { pname = "mednafen"; <del> version = "1.26.1"; </del> <ins> version = "1.29.0"; </ins> src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; <del> sha256 = "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4"; </del> <ins> hash = "sha256-2j+88Ch3+b4PAov6XRy1npU6QEm5D+fjk4ijOG2fNi4="; </ins> }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ <ins> SDL2 SDL2_net alsa-lib flac </ins> freeglut <del> libGLU libGL </del> <ins> libGL libGLU libX11 </ins> libcdio libjack2 <del> alsa-lib </del> libsamplerate libsndfile <del> libX11 SDL2 SDL2_net </del> zlib ];


<del> { lib, buildNpmPackage, fetchFromGitHub, vscode }: </del> <ins> { lib, stdenv, buildNpmPackage, fetchFromGitHub, vscode }: </ins> buildNpmPackage rec { pname = "vscode-langservers-extracted";


umurmur = callPackage ../applications/networking/umurmur { }; <del> udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; </del> <ins> udocker = callPackage ../tools/virtualization/udocker { }; </ins> uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine;


<ins> diff --git a/MathMod.pro b/MathMod.pro index 2e2fbf1..bb8f8bd 100644 --- a/MathMod.pro +++ b/MathMod.pro @@ -63,7 +63,5 @@ OTHER_FILES     +=  mathmodcollection.js  mathmodconfig.js # install -target.path    = $TARGET -sources.files  = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mathmod.pro -sources.path   = $TARGET -INSTALLS      += target sources +target.path    = @out@/bin +INSTALLS      += target </ins>


}; }; <ins> disableImagemagick = mkOption { type = types.bool; default = false; description = '' Whether to not load the ImageMagick module into PHP. This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). You may want to disable it for increased security. In that case, previews will still be available for some images (e.g. JPEG and PNG). See https://github.com/nextcloud/server/issues/13099 ''; }; </ins> caching = { apcu = mkOption { type = types.bool;


}; config = mkMerge [ <ins> ({ # minimal configuration file to make lvmconfig/lvm2-activation-generator happy environment.etc."lvm/lvm.conf".text = "config {}"; }) </ins> (mkIf (!config.boot.isContainer) { systemd.tmpfiles.packages = [ cfg.package.out ]; environment.systemPackages = [ cfg.package ];


xdotool = callPackage ../tools/X11/xdotool { }; <ins> xed-editor = callPackage ../applications/editors/xed-editor { xapps = cinnamon.xapps; }; </ins> xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); xen = xenPackages.xen-vanilla;


libcaca = null; }; <del> vlc_qt5 = vlc; </del> libvlc = vlc.override { withQt5 = false; qtbase = null;


let pname = "shogun"; version = "6.1.4"; rxcppVersion = "4.0.0"; gtestVersion = "1.8.0"; srcs = { toolbox = fetchFromGitHub { owner = pname + "-toolbox";


}) ]; <ins> # Tweaks to fix undefined variable substitutions # https://github.com/HowardHinnant/date/pull/538#pullrequestreview-1373268697 postPatch = '' substituteInPlace date.pc.in  --replace '@CMAKE_INSTALL_LIB@' '@CMAKE_INSTALL_FULL_LIBDIR@'  --replace '@CMAKE_INSTALL_INCLUDE@' '@CMAKE_INSTALL_FULL_INCLUDEDIR@'  --replace '@PACKAGE_VERSION@' '${version}' ''; </ins> nativeBuildInputs = [ cmake ]; cmakeFlags = [


github = "auchter"; githubId = 1190483; }; <ins> aucub = { name = "aucub"; email = "dr56ekgbb@mozmail.com"; github = "aucub"; githubId = 78630225; }; </ins> augustebaum = { email = "auguste.apple@gmail.com"; github = "augustebaum";


<ins> diff --git a/build.gradle b/build.gradle index 7025b2b..d063da3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,11 @@ repositories { } +tasks.withType(AbstractArchiveTask) { +    preserveFileTimestamps = false +    reproducibleFileOrder = true +} + licenseReport { renderers = [new JsonReportRenderer()] </ins>


sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2"; revert = true; }) <ins> (fetchpatch { name = "CVE-2021-4145.patch"; url = "https://gitlab.com/qemu-project/qemu/-/commit/66fed30c9cd11854fc878a4eceb507e915d7c9cd.patch"; sha256 = "10za2nag51y4fhc8z7fzw3dfhj37zx8rwg0xcmw5kzmb0gyvvz70"; }) </ins> ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ ./sigrtminmax.patch


# Note: fish completion script is not supported. $out/bin/rustup completions bash cargo > "$out/share/bash-completion/completions/cargo" $out/bin/rustup completions zsh cargo >  "$out/share/zsh/site-functions/_cargo" <ins> # add a wrapper script for ld.lld mkdir -p $out/nix-support substituteAll ${../../../../../pkgs/build-support/wrapper-common/utils.bash} $out/nix-support/utils.bash substituteAll ${../../../../../pkgs/build-support/bintools-wrapper/add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${../../../../../pkgs/build-support/bintools-wrapper/add-hardening.sh} $out/nix-support/add-hardening.sh export prog='$PROG' export use_response_file_by_default=0 substituteAll ${../../../../../pkgs/build-support/bintools-wrapper/ld-wrapper.sh} $out/nix-support/ld-wrapper.sh chmod +x $out/nix-support/ld-wrapper.sh </ins> ''; <ins> env = lib.optionalAttrs (pname == "rustup") { inherit (stdenv.cc.bintools) expandResponseParams shell suffixSalt wrapperName coreutils_bin; hardening_unsupported_flags = ""; }; </ins> meta = with lib; { description = "The Rust toolchain installer"; homepage = "https://www.rustup.rs/";


let pname = "osu-lazer-bin"; <del> version = "2023.1026.0"; </del> <ins> version = "2023.1114.1"; </ins> name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; <del> sha256 = "sha256-6IaN189cV/ORP77zrjdcCPwPzNR/W6JmrZXVasCx8MQ="; </del> <ins> sha256 = "sha256-MQkHbodSkAQQpjaBP+Q35afcCrgcie6UoUldc+vjRA0="; </ins> }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; <del> sha256 = "sha256-XrlajKT3GLjfj800mULj9iwkF9Bvx9Rlz56K6welq2U="; </del> <ins> sha256 = "sha256-40ylXbn9jV9v+ve1hFwhT5/jhzNfWHjL2WIplVUD2qk="; </ins> }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; <del> sha256 = "sha256-yr7PtBUBE0tB0giAE8aQCNJvxS/tMzlLWpJ3NyosQZk="; </del> <ins> sha256 = "sha256-Q2z2Js0Zc9nvyQNxzLuuV7TcwiNIRo+RMRER6ZYgh74="; </ins> }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");


./services/misc/tautulli.nix ./services/misc/tiddlywiki.nix ./services/misc/tp-auto-kbbl.nix <ins> ./services/misc/turn-rs.nix </ins> ./services/misc/tuxclocker.nix ./services/misc/transfer-sh.nix ./services/misc/tzupdate.nix


runHook postInstall ''; <ins> fixupPhase = '' runHook preFixup wrapProgramShell $out/share/spotify/spotify  ''${gappsWrapperArgs[@]}  ${lib.optionalString (deviceScaleFactor != null) '' --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}"  ''}  --prefix LD_LIBRARY_PATH : "$librarypath"  --prefix PATH : "${gnome.zenity}/bin"  --add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postFixup ''; </ins> meta = meta // { maintainers = with lib.maintainers; [ eelco ftrvxmtrx sheenobu timokau ma27 ]; };


inherit pname; version = "2.0.1"; <del> outputs = [ "bin" "out" "dev" "doc" "man" ]; </del> <ins> outputs = [ "out" "lib" "dev" "doc" "man" ]; </ins> src = fetchFromGitLab { domain = "salsa.debian.org";


# Relative paths. "BINDIR=/bin" "PERLDIR=/share/perl5" <del> "MODSDIR=/lib/" </del> <ins> "MODSDIR=/nonexistent" # AMC will test for that dir before # defaulting to the "portable" strategy, so this test *must* fail. </ins> "TEXDIR=/tex/latex/" # what texlive.combine expects "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this? "MAN1DIR=/share/man/man1"


<ins> diff --git i/widgets/settings/settingsdialog.cpp w/widgets/settings/settingsdialog.cpp index 4deff1f..16845b5 100644 --- i/widgets/settings/settingsdialog.cpp +++ w/widgets/settings/settingsdialog.cpp @@ -802,7 +802,7 @@ bool setAutostartEnabled(bool enabled) desktopFile.write("[Desktop Entry]n" "Name=" APP_NAME "n" "Exec=""); -        desktopFile.write(qEnvironmentVariable("APPIMAGE", QCoreApplication::applicationFilePath()).toUtf8().data()); +        desktopFile.write(qEnvironmentVariable("APPIMAGE", EXEC_NIX_PATH).toUtf8().data()); desktopFile.write("" qt-widgets-gui --single-instancenComment=" APP_DESCRIPTION "n" "Icon=" PROJECT_NAME "n" "Type=Applicationn" </ins>


<ins> # pkgs.dockerTools {#sec-pkgs-dockerTools} `pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120). Docker itself is not used to perform any of the operations done by these functions. ## buildImage {#ssec-pkgs-dockerTools-buildImage} This function is analogous to the `docker build` command, in that it can be used to build a Docker-compatible repository tarball containing a single image with one or multiple layers. As such, the result is suitable for being loaded in Docker with `docker load`. The parameters of `buildImage` with relative example values are described below: []{#ex-dockerTools-buildImage} []{#ex-dockerTools-buildImage-runAsRoot} ```nix buildImage { name = "redis"; tag = "latest"; fromImage = someBaseImage; fromImageName = null; fromImageTag = "latest"; contents = pkgs.redis; runAsRoot = '' #!${pkgs.runtimeShell} mkdir -p /data ''; config = { Cmd = [ "/bin/redis-server" ]; WorkingDir = "/data"; Volumes = { "/data" = { }; }; }; } ``` The above example will build a Docker image `redis/latest` from the given base image. Loading and running this image in Docker results in `redis-server` being started automatically. - `name` specifies the name of the resulting image. This is the only required argument for `buildImage`. - `tag` specifies the tag of the resulting image. By default it's `null`, which indicates that the nix output hash will be used as tag. - `fromImage` is the repository tarball containing the base image. It must be a valid Docker image, such as exported by `docker save`. By default it's `null`, which can be seen as equivalent to `FROM scratch` of a `Dockerfile`. - `fromImageName` can be used to further specify the base image within the repository, in case it contains multiple images. By default it's `null`, in which case `buildImage` will peek the first image available in the repository. - `fromImageTag` can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it's `null`, in which case `buildImage` will peek the first tag available for the base image. - `contents` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it's `null`. - `runAsRoot` is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied `contents` derivation. This can be similarly seen as `RUN ...` in a `Dockerfile`. > **_NOTE:_** Using this parameter requires the `kvm` device to be available. - `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). After the new layer has been created, its closure (to which `contents`, `config` and `runAsRoot` contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied. At the end of the process, only one new single layer will be produced and added to the resulting image. The resulting repository will only list the single image `image/tag`. In the case of [the `buildImage` example](#ex-dockerTools-buildImage) it would be `redis/latest`. It is possible to inspect the arguments with which an image was built using its `buildArgs` attribute. > **_NOTE:_** If you see errors similar to `getProtocolByName: does not exist (no such protocol name: tcp)` you may need to add `pkgs.iana-etc` to `contents`. > **_NOTE:_** If you see errors similar to `Error_Protocol ("certificate has unknown CA",True,UnknownCa)` you may need to add `pkgs.cacert` to `contents`. By default `buildImage` will use a static date of one second past the UNIX Epoch. This allows `buildImage` to produce binary reproducible images. When listing images with `docker images`, the newly created images will be listed like this: ```ShellSession $ docker images REPOSITORY   TAG      IMAGE ID       CREATED        SIZE hello        latest   08c791c7846e   48 years ago   25.2MB ``` You can break binary reproducibility but have a sorted, meaningful `CREATED` column by setting `created` to `now`. ```nix pkgs.dockerTools.buildImage { name = "hello"; tag = "latest"; created = "now"; contents = pkgs.hello; config.Cmd = [ "/bin/hello" ]; } ``` and now the Docker CLI will display a reasonable date and sort the images as expected: ```ShellSession $ docker images REPOSITORY   TAG      IMAGE ID       CREATED              SIZE hello        latest   de2bf4786de6   About a minute ago   25.2MB ``` however, the produced images will not be binary reproducible. ## buildLayeredImage {#ssec-pkgs-dockerTools-buildLayeredImage} Create a Docker image with many of the store paths being on their own layer to improve sharing between images. The image is realized into the Nix store as a gzipped tarball. Depending on the intended usage, many users might prefer to use `streamLayeredImage` instead, which this function uses internally. `name` : The name of the resulting image. `tag` _optional_ : Tag of the generated image. *Default:* the output path's hash `contents` _optional_ : Top level paths in the container. Either a single derivation, or a list of derivations. *Default:* `[]` `config` _optional_ : Run-time configuration of the container. A full list of the options are available at in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). *Default:* `{}` `created` _optional_ : Date and time the layers were created. Follows the same `now` exception supported by `buildImage`. *Default:* `1970-01-01T00:00:01Z` `maxLayers` _optional_ : Maximum number of layers to create. *Default:* `100` *Maximum:* `125` `extraCommands` _optional_ : Shell commands to run while building the final layer, without access to most of the layer contents. Changes to this layer are "on top" of all the other layers, so can create additional directories and files. ### Behavior of `contents` in the final image {#dockerTools-buildLayeredImage-arg-contents} Each path directly listed in `contents` will have a symlink in the root of the image. For example: ```nix pkgs.dockerTools.buildLayeredImage { name = "hello"; contents = [ pkgs.hello ]; } ``` will create symlinks for all the paths in the `hello` package: ```ShellSession /bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello /share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info /share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo ``` ### Automatic inclusion of `config` references {#dockerTools-buildLayeredImage-arg-config} The closure of `config` is automatically included in the closure of the final image. This allows you to make very simple Docker images with very little code. This container will start up and run `hello`: ```nix pkgs.dockerTools.buildLayeredImage { name = "hello"; config.Cmd = [ "${pkgs.hello}/bin/hello" ]; } ``` ### Adjusting `maxLayers` {#dockerTools-buildLayeredImage-arg-maxLayers} Increasing the `maxLayers` increases the number of layers which have a chance to be shared between different images. Modern Docker installations support up to 128 layers, however older versions support as few as 42. If the produced image will not be extended by other Docker builds, it is safe to set `maxLayers` to `128`. However it will be impossible to extend the image further. The first (`maxLayers-2`) most "popular" paths will have their own individual layers, then layer #`maxLayers-1` will contain all the remaining "unpopular" paths, and finally layer #`maxLayers` will contain the Image configuration. Docker's Layers are not inherently ordered, they are content-addressable and are not explicitly layered until they are composed in to an Image. ## streamLayeredImage {#ssec-pkgs-dockerTools-streamLayeredImage} Builds a script which, when run, will stream an uncompressed tarball of a Docker image to stdout. The arguments to this function are as for `buildLayeredImage`. This method of constructing an image does not realize the image into the Nix store, so it saves on IO and disk/cache space, particularly with large images. The image produced by running the output script can be piped directly into `docker load`, to load it into the local docker daemon: ```ShellSession $(nix-build) | docker load ``` Alternatively, the image be piped via `gzip` into `skopeo`, e.g. to copy it into a registry: ```ShellSession $(nix-build) | gzip --fast | skopeo copy docker-archive:/dev/stdin docker://some_docker_registry/myimage:tag ``` ## pullImage {#ssec-pkgs-dockerTools-fetchFromRegistry} This function is analogous to the `docker pull` command, in that it can be used to pull a Docker image from a Docker registry. By default [Docker Hub](https://hub.docker.com/) is used to pull images. Its parameters are described in the example below: ```nix pullImage { imageName = "nixos/nix"; imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; finalImageName = "nix"; finalImageTag = "1.11"; sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; os = "linux"; arch = "x86_64"; } ``` - `imageName` specifies the name of the image to be downloaded, which can also include the registry namespace (e.g. `nixos`). This argument is required. - `imageDigest` specifies the digest of the image to be downloaded. This argument is required. - `finalImageName`, if specified, this is the name of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's equal to `imageName`. - `finalImageTag`, if specified, this is the tag of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's `latest`. - `sha256` is the checksum of the whole fetched image. This argument is required. - `os`, if specified, is the operating system of the fetched image. By default it's `linux`. - `arch`, if specified, is the cpu architecture of the fetched image. By default it's `x86_64`. `nix-prefetch-docker` command can be used to get required image parameters: ```ShellSession $ nix run nixpkgs.nix-prefetch-docker -c nix-prefetch-docker --image-name mysql --image-tag 5 ``` Since a given `imageName` may transparently refer to a manifest list of images which support multiple architectures and/or operating systems, you can supply the `--os` and `--arch` arguments to specify exactly which image you want. By default it will match the OS and architecture of the host the command is run on. ```ShellSession $ nix-prefetch-docker --image-name mysql --image-tag 5 --arch x86_64 --os linux ``` Desired image name and tag can be set using `--final-image-name` and `--final-image-tag` arguments: ```ShellSession $ nix-prefetch-docker --image-name mysql --image-tag 5 --final-image-name eu.gcr.io/my-project/mysql --final-image-tag prod ``` ## exportImage {#ssec-pkgs-dockerTools-exportImage} This function is analogous to the `docker export` command, in that it can be used to flatten a Docker image that contains multiple layers. It is in fact the result of the merge of all the layers of the image. As such, the result is suitable for being imported in Docker with `docker import`. > **_NOTE:_** Using this function requires the `kvm` device to be available. The parameters of `exportImage` are the following: ```nix exportImage { fromImage = someLayeredImage; fromImageName = null; fromImageTag = null; name = someLayeredImage.name; } ``` The parameters relative to the base image have the same synopsis as described in [buildImage](#ssec-pkgs-dockerTools-buildImage), except that `fromImage` is the only required argument in this case. The `name` argument is the name of the derivation output, which defaults to `fromImage.name`. ## shadowSetup {#ssec-pkgs-dockerTools-shadowSetup} This constant string is a helper for setting up the base files for managing users and groups, only if such files don't exist already. It is suitable for being used in a [`buildImage` `runAsRoot`](#ex-dockerTools-buildImage-runAsRoot) script for cases like in the example below: ```nix buildImage { name = "shadow-basic"; runAsRoot = '' #!${pkgs.runtimeShell} ${shadowSetup} groupadd -r redis useradd -r -g redis redis mkdir /data chown redis:redis /data ''; } ``` Creating base files like `/etc/passwd` or `/etc/login.defs` is necessary for shadow-utils to manipulate users and groups. </ins>


"-X gitlab.com/olaris/olaris-server/helpers.Version=${version}" ]; <del> vendorHash = "sha256-xWywDgw0LzJhPtVK0aGgT0TTanejJ39ZmGc50A3d68U="; </del> <ins> vendorHash = "sha256-bw8zvDGFBci9bELsxAD0otpNocBnO8aAcgyohLZ3Mv0="; </ins> <del> nativeBuildInputs = [ installShellFiles ]; </del> <ins> nativeBuildInputs = [ installShellFiles makeWrapper ]; </ins> # integration tests require network access doCheck = false;


- [go-camo](https://github.com/cactus/go-camo), a secure image proxy server. Available as [services.go-camo](#opt-services.go-camo.enable). <ins> - [Monado](https://monado.freedesktop.org/), an open source XR runtime. Available as [services.monado](#opt-services.monado.enable). </ins> - [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable). - [TuxClocker](https://github.com/Lurkki14/tuxclocker), a hardware control and monitoring program. Available as [programs.tuxclocker](#opt-programs.tuxclocker.enable).


bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; <del> busybox = callPackage ../os-specific/linux/busybox { }; </del> <ins> busybox = callPackage ../os-specific/linux/busybox { # Fixes libunwind from being dynamically linked to a static binary. stdenv = if (stdenv.targetPlatform.useLLVM or false) then overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx else stdenv; }; </ins> busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { # musl roadmap has RISC-V support projected for 1.1.20 busybox = if !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isLoongArch64 && stdenv.hostPlatform.libc != "bionic"


tryExec = "itch"; icon = "itch"; desktopName = "itch"; <del> mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; </del> <ins> mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; </ins> comment = "Install and play itch.io games easily"; categories = [ "Game" ]; })


optionalString config.security.pam.enableEcryptfs '' session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so '' + <ins> optionalString config.security.pam.enableFscrypt '' # Work around https://github.com/systemd/systemd/issues/8598 # Skips the pam_fscrypt module for systemd-user sessions which do not have a password # anyways. # See also https://github.com/google/fscrypt/issues/95 session [success=1 default=ignore] pam_succeed_if.so service = systemd-user session optional ${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so '' + </ins> optionalString cfg.pamMount '' session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive '' +


}; nativeBuildInputs = [ python3 dune_3 makeWrapper ]; <del> buildInputs = [ poppler_utils ] ++ (with ocamlPackages; [ oseq spelll notty nottui lwd cmdliner domainslib digestif yojson eio_main containers-data timedesc ]); </del> <ins> buildInputs = with ocamlPackages; [ oseq spelll notty nottui lwd cmdliner domainslib digestif yojson eio_main containers-data timedesc ]; </ins> postInstall = '' # docfd needs pdftotext from popler_utils to allow pdf search <del> wrapProgram $out/bin/docfd --prefix PATH : "${lib.getBin poppler_utils}/bin/" </del> <ins> # also fzf for "docfd ?" usage wrapProgram $out/bin/docfd --prefix PATH : "${lib.makeBinPath [ poppler_utils fzf ]}" </ins> ''; meta = with lib; { description = "TUI multiline fuzzy document finder"; longDescription = '' <del> Interactive grep, but word/token/phrase based rather than regex and line based, so you can search across multiple lines (simlar to Recoll but TUI). Aims to provide a good UX via text editor and PDF viewer integration. When opening a text file, Docfd opens file at first line of search result. If PDF, then Docfd opens file at first page of the search result and starts a text search of the most unique word of the matched phrase within the same page. Main intended use case: navigating directories of notes and PDFs. </del> <ins> TUI multiline fuzzy document finder. Think interactive grep for both text files and PDFs, but word/token based instead of regex and line based, so you can search across lines easily. Docfd aims to provide good UX via integration with common text editors and PDF viewers, so you can jump directly to a search result with a single key press. </ins> ''; homepage = "https://github.com/darrenldl/docfd"; license = licenses.mit;


stdenv.mkDerivation rec { pkgname = "conkeror"; <del> version = "1.0pre-20160130"; </del> <ins> version = "1.0.3"; </ins> name = "${pkgname}-${version}"; src = fetchgit { url = git://repo.or.cz/conkeror.git; <del> rev = "3e4732cd0d15aa70121fe0a0403103b777c964bf"; sha256 = "1299b1kdfd2vip3w02jzvj2i8scjpsvpx19d2c8ms2pizz7xxmp4"; </del> <ins> rev = "refs/tags/${version}"; sha256 = "06fhfk8km3gd1lc19543zn0c71zfbn8wsalinvm1dbgi724f52pd"; </ins> }; buildInputs = [ unzip makeWrapper ];


in python3Packages.buildPythonApplication rec { pname = "bottles"; <del> version = "2022.5.28-trento-3"; </del> <ins> version = "2022.10.14.1"; </ins> src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; <del> sha256 = "sha256-KIDLRqDLFTsVAczRpTchnUtKJfVHqbYzf8MhIR5UdYY="; </del> <ins> sha256 = "sha256-FO91GSGlc2f3TSLrlmRDPi5p933/Y16tdEpX4RcKhL0="; </ins> }; <ins> patches = [ ./vulkan_icd.patch ]; </ins> postPatch = '' chmod +x build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py <del> substituteInPlace src/backend/wine/winecommand.py  </del> <ins> substituteInPlace bottles/backend/wine/winecommand.py  </ins> --replace  <del> 'self.__get_runner()'  '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())' ''; </del> <ins> "command = f"{runner} {command}""  "command = f"{''' if runner == 'wine' or runner == 'wine64' else '${steam-run}/bin/steam-run '}{runner} {command}""  --replace  "command = f"{_picked['entry_point']} {command}""  "command = f"${steam-run}/bin/steam-run {_picked['entry_point']} {command}"" ''; </ins> nativeBuildInputs = [ <ins> blueprint-compiler </ins> meson ninja pkg-config <del> wrapGAppsHook gettext </del> <ins> wrapGAppsHook4 gtk4 # gtk4-update-icon-cache </ins> appstream-glib desktop-file-utils ]; buildInputs = [ <del> gdk-pixbuf glib gobject-introspection gsettings-desktop-schemas gspell gtk3 gtksourceview4 libhandy libnotify webkitgtk gnome.adwaita-icon-theme </del> <ins> librsvg gtk4 gtksourceview5 libadwaita </ins> ]; propagatedBuildInputs = with python3Packages; [ pyyaml <del> pytoml </del> requests <del> pycairo </del> pygobject3 <del> lxml dbus-python gst-python liblarch </del> patool markdown <ins> fvs pefile urllib3 chardet certifi idna pillow orjson icoextract </ins> ] ++ [ <del> steam-run xdg-utils pciutils </del> cabextract <del> wine freetype </del> p7zip <del> gamemode # programs.gamemode.enable </del> <ins> xdpyinfo imagemagick procps gamescope </ins> mangohud <ins> vmtouch wine </ins> ]; format = "other"; <del> strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 </del> dontWrapGApps = true; # prevent double wrapping preFixup = ''


# we create wrapper for the binaries in the different packages postBuild = '' <del> . "${makeWrapper}/nix-support/setup-hook" # get access to lua functions . ${lua}/nix-support/setup-hook </del> if [ -L "$out/bin" ]; then unlink "$out/bin" fi


<ins> { config, lib, pkgs, ... }: with lib; { meta = { maintainers = teams.pantheon.members; }; ###### interface options = { programs.pantheon-tweaks.enable = mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon"; }; ###### implementation config = mkIf config.programs.pantheon-tweaks.enable { services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ]; }; } </ins>


catalogue = callPackage ../development/python-modules/catalogue { }; <ins> catboost = callPackage ../development/python-modules/catboost { }; </ins> cbeams = callPackage ../misc/cbeams { }; cbor2 = callPackage ../development/python-modules/cbor2 { };


<del> { stdenv, buildPythonPackage, fetchPypi, substituteAll, isPy3k, geos, gdal, pytz, withGdal ? false }: buildPythonPackage rec { pname = "Django"; version = "2.0.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; sha256 = "0292a7ad7d8ffc9cfc6a77f043d2e81f5bbc360c0c4a1686e130ef3432437d23"; }; patches = stdenv.lib.optionals withGdal [ (substituteAll { src = ./1.10-gis-libs.template.patch; geos = geos; gdal = gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; }) ]; # patch only $out/bin to avoid problems with starter templates (see #3134) postFixup = '' wrapPythonProgramsIn $out/bin "$out $pythonPath" ''; propagatedBuildInputs = [ pytz ]; # too complicated to setup doCheck = false; meta = with stdenv.lib; { description = "A high-level Python Web framework"; homepage = https://www.djangoproject.com/; license = licenses.bsd3; maintainers = with maintainers; [ georgewhewell ]; }; } </del>


buildGo117Module rec { pname = "dstp"; <del> version = "0.3.0"; </del> <ins> version = "0.4.0"; </ins> src = fetchFromGitHub { owner = "ycd"; repo = pname; rev = "v${version}"; <del> sha256 = "1pxzaz2a261lsnbdbr9km1214a4jzq2wgkdfvf9g966gsa4nqfl6"; </del> <ins> sha256 = "sha256-YvuUgHHa8Egk+bbSI0SH0i3YrKWRbzjAckNG32RBRXw="; </ins> }; <del> vendorSha256 = "1n1kx4zcskndikjl44vwmckr6x5cv6cacwdwfwjjsf6aqgagpld8"; </del> <ins> vendorSha256 = "sha256-qNH71MPKOC0ld7xxppjZrHSTJ6t8E0LljM1OzT7pM9g="; </ins> # Tests require network connection, but is not allowed by nix doCheck = false;


wantedBy = [ "multi-user.target" ]; wants = [ "keys.target" ]; <del> after = [ "network.target" "fs.target" "postgresql.service" "keys.target" ]; </del> <ins> after = [ "network.target" "fs.target" "keys.target" ]; </ins> path = [ httpd pkgs.coreutils pkgs.gnugrep ]


stdenv.mkDerivation rec { name = "root-${version}"; <del> version = "6.09.02"; </del> <ins> version = "6.10.00"; </ins> src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; <del> sha256 = "0fc6b0l7bw66cyckxs4ikvyzcv1zlfx88205jx153smdhih0jj2k"; </del> <ins> sha256 = "1rxqcpqf1b3sxig5xbh3mkvarhg9lgj2f0gv0j48klfw8kgfwlsp"; </ins> }; buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ]


nlopt lp_solve colpack <del> ] ++ lib.optionals pythonSupport (with python2Packages; [ python numpy ]) </del> <ins> ] ++ lib.optionals pythonSupport (with python3Packages; [ python numpy ]) </ins> ++ lib.optional opencvSupport opencv; cmakeFlags = let


<ins> Fix a following build error: In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: ../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|." static_assert( ^ ../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here : AssertConstructible<Ns, Args, std::decay_t<Args>, Unwrapped, Params>... { ^ ../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity<std::__1::integer_sequence<unsigned long, 0, 1>, base::internal::TypeList<base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, const long &>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, NSError *> >' requested here static_assert(internal::AssertBindArgsValidity< ^ ../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here return base::BindRepeating(std::forward<Functor>(functor), ^ ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, ^ Resurrected from https://github.com/NixOS/nixpkgs/blob/ddcf01bca6c7a7a7f096bec836a1e6a707ad473d/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch because the same problem is present in 5.12 when compiling on macOS. --- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm +++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm @@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, -                   weak_ptr_factory_.GetWeakPtr(), nil)); +                   weak_ptr_factory_.GetWeakPtr(), nullptr)); } } </ins>


rustPlatform.buildRustPackage rec { pname = "lapce"; <del> version = "0.0.10"; </del> <ins> version = "0.0.12"; </ins> src = fetchFromGitHub { owner = "lapce"; repo = pname; rev = "v${version}"; <del> sha256 = "tOVFm4DFQurFU4DtpPwxXQLbTGCZnrV1FfYKtvkRxRE="; </del> <ins> sha256 = "sha256-ZFQjQ5+G0b0Fgg3+du/drt+62rC/TCNR5MIdJXAkTrE="; </ins> }; <del> cargoPatches = [ ./fix-version.patch ]; cargoSha256 = "BwB3KgmI5XnZ5uHv6f+kGKBzpyxPWcoKvF7qw90eorI="; </del> <ins> cargoSha256 = "sha256-sMTootPsenaWzLLFImo6HWC1pcm2uFupPhVWsUJp1Ak="; </ins> nativeBuildInputs = [ cmake


<del> { mkDerivation, lib, fetchurl, qtbase, qttools, qmake }: </del> <ins> { mkDerivation, lib, fetchurl, qtbase, qtsvg, qttools, qmake }: </ins> let inherit (lib) getDev; in


<del> { stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: </del> <ins> { lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: </ins> <del> stdenv.mkDerivation { </del> <ins> mkDerivation { </ins> name = "twmn-git-2018-10-01"; src = fetchFromGitHub {


, fetchFromGitHub }: <del> python3.pkgs.buildPythonApplication rec { </del> <ins> let python = python3.override { # FlexGet doesn't support transmission-rpc>=5 yet # https://github.com/NixOS/nixpkgs/issues/258504 packageOverrides = self: super: { transmission-rpc = super.transmission-rpc.overridePythonAttrs (old: rec { version = "4.3.1"; src = fetchPypi { pname = "transmission_rpc"; inherit version; hash = "sha256-Kh2eARIfM6MuXu7RjPPVhvPZ+bs0AXkA4qUCbfu5hHU="; }; doCheck = false; }); }; }; in python.pkgs.buildPythonApplication rec { </ins> pname = "flexget"; version = "3.9.10"; format = "pyproject";


sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go '' + lib.optionalString stdenv.isLinux '' <del> sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go </del> <ins> # prepend the nix path to the zoneinfo files but also leave the original value for static binaries # that run outside a nix server sed -i 's,"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/",nt&,' src/time/zoneinfo_unix.go </ins> # Find the loader dynamically LOADER="$(find ${lib.getLib libc}/lib -name ld-linux* | head -n 1)"


assert "Failed to connect" not in status,  "Failed to connect to the daemon" <ins> with subtest("Daemon can be configured imperatively"): imperative.wait_for_unit("wpa_supplicant-wlan1.service") imperative.wait_until_succeeds("wpa_cli -i wlan1 status") imperative.succeed("wpa_cli -i wlan1 add_network") imperative.succeed("wpa_cli -i wlan1 set_network 0 ssid '"nixos-test"'") imperative.succeed("wpa_cli -i wlan1 set_network 0 psk '"reproducibility"'") imperative.succeed("wpa_cli -i wlan1 save_config") imperative.succeed("grep -q nixos-test /etc/wpa_supplicant.conf") </ins> machineSae.wait_for_unit("hostapd.service") machineSae.copy_from_vm("/run/hostapd/wlan0.hostapd.conf") with subtest("Daemon can connect to the SAE access point using SAE"):


version = "8.0.0"; src = fetchurl { <del> url = "https://web.archive.org/web/20211130172544/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb"; </del> <ins> url = "https://web.archive.org/web/20211228025517if_/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb"; </ins> name = "tetrio-desktop.deb"; sha256 = "1nlblfhrph4cw8rpic9icrs78mzrxyskl7ggyy2i8bk9i07i21xf"; };


libPath = lib.makeLibraryPath [ alsa-lib cups <ins> libpulseaudio </ins> libX11 libXScrnSaver libXtst


<ins> diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala index 589121b..8e9c81e 100644 --- a/src/Settings/ThemeSettings.vala +++ b/src/Settings/ThemeSettings.vala @@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings { var themes = new Gee.ArrayList<string> (); string[] dirs = { -            "/usr/share/" + path + "/", +            "/run/current-system/sw/share/" + path + "/", Environment.get_home_dir () + "/." + path + "/", Environment.get_home_dir () + "/.local/share/" + path + "/"}; </ins>


<ins> { stdenv, lib, pkg-config, fetchFromGitHub, xorg, libdrm, SDL2, }: stdenv.mkDerivation (finalAttrs: { pname = "switchres"; version = "2.2.1"; src = fetchFromGitHub { owner = "antonioginer"; repo = "switchres"; rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-/21RcpumWYNBPck7gpH6krwC3Thz/rKDPgeJblN2BDA="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libXrandr xorg.xorgproto libdrm SDL2 ]; patchPhase = '' runHook preHook substituteInPlace ./custom_video_xrandr.cpp  --replace-fail libX11.so ${xorg.libX11}/lib/libX11.so  --replace-fail libXrandr.so ${xorg.libXrandr}/lib/libXrandr.so substituteInPlace ./custom_video_drmkms.cpp  --replace-fail libdrm.so ${libdrm}/lib/libdrm.so  runHook postHook ''; env = { PREFIX = "$(out)"; }; preInstall = '' install -Dm755 switchres $out/bin/switchres ''; meta = { description = "Modeline generation engine for emulation"; homepage = "https://github.com/antonioginer/switchres"; changelog = "https://github.com/antonioginer/switchres/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl2Only; mainProgram = "switchres"; maintainers = with lib.maintainers; [ bot-wxt1221 ]; platforms = lib.platforms.linux; }; }) </ins>