}) ]; <del> extraBuildCommands = '' mkdir -p steamrt </del> <ins> extraBuildCommands = '' mkdir -p steamrt ln -s ../lib/steam-runtime steamrt/${steam-runtime.arch} ${lib.optionalString (steam-runtime-i686 != null) '' ln -s ../lib32/steam-runtime steamrt/${steam-runtime-i686.arch} ''} ''; </ins> <del> ln -s ../lib64/steam-runtime steamrt/amd64 ln -s ../lib32/steam-runtime steamrt/i386 ''; </del> <ins> extraInstallCommands = '' mkdir -p $out/share/applications ln -s ${steam}/share/icons $out/share ln -s ${steam}/share/pixmaps $out/share sed "s,/usr/bin/steam,$out/bin/steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop ''; </ins> <del> extraInstallCommands = '' mkdir -p $out/share/applications ln -s ${steam}/share/icons $out/share ln -s ${steam}/share/pixmaps $out/share sed "s,/usr/bin/steam,$out/bin/steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop ''; </del> <ins> profile = '' export STEAM_RUNTIME=/steamrt ''; </ins> <del> profile = '' export STEAM_RUNTIME=/steamrt ''; </del> <ins> runScript = "steam"; </ins> <del> runScript = "steam"; } </del> <ins> passthru.run = buildFHSUserEnv (self // { name = "steam-run"; runScript = let ldPath = map (x: "/steamrt/${steam-runtime.arch}/" + x) steam-runtime.libs ++ lib.optionals (steam-runtime-i686 != null) (map (x: "/steamrt/${steam-runtime-i686.arch}/" + x) steam-runtime-i686.libs); in writeScript "steam-run" '' #!${stdenv.shell} run="$1" if [ "$run" = "" ]; then echo "Usage: steam-run command-to-run args..." >&2 exit 1 fi shift export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH exec "$run" "$@" ''; passthru = {}; }); }; in buildFHSUserEnv self </ins>


}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; <del> version = "1.20.2"; </del> <ins> version = "1.22.0"; </ins> src = fetchurl { url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; <del> hash = "sha256-4QSBKVnEH7yDXwqY+29/a+yWv89i/TVCYO26V95KA4s="; </del> <ins> hash = "sha256-ARIUHmU/YN8IoAFMkcxzGAoH31vbJLT7HfYD6a57QaY="; </ins> }; dontConfigure = true;


}; postPatch = '' <del> addAutoPatchelfSearchPath ${jre8}/lib/openjdk/jre/lib/ </del> <ins> addAutoPatchelfSearchPath ${jdk}/lib/openjdk/lib/ </ins> autoPatchelf lib # Nix cannot see the runtime references to the paths we just patched in


installTargets = [ "install" "install-lib" ]; <del> # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; </del> <ins> postInstall = '' # Remove update-pciids as it won't work on nixos rm $out/sbin/update-pciids $out/man/man8/update-pciids.8 # use database from hwdata instead # (we don't create a symbolic link because we do not want to pull in the # full closure of hwdata) cp --reflink=auto ${hwdata}/share/hwdata/pci.ids $out/share/pci.ids ''; </ins> meta = with lib; { homepage = "http://mj.ucw.cz/pciutils.html";


globalAsserts = prefix: cfg: flatten [ <del> (assertKeysValid prefix freeformGlobalKeys cfg.settings) </del> <ins> (assertKeysValid "${prefix}.settings" freeformGlobalKeys cfg.settings) </ins> (imap0 (n: l: listenerAsserts "${prefix}.listener.${toString n}" l) cfg.listeners) (mapAttrsToList (n: b: bridgeAsserts "${prefix}.bridge.${n}" b) cfg.bridges) ];


repo = "river"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; <del> hash = "sha256-I09cR5aN7qXOzV9HDXaL4TjoeJcVa0Ch00zxOJokdDE="; </del> <ins> hash = "sha256-DYaxtYJLZQqE2SyPfWec/zXsZKRnxK2QNgOkM7GJkLI="; </ins> }; deps = callPackage ./build.zig.zon.nix { };


maintainers = with maintainers; [ fab ]; platforms = platforms.linux; }; <del> } </del> <ins> }) </ins>


installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; <del> version = "1.0.10"; </del> <ins> version = "1.0.11"; </ins> outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; <del> sha256 = "1fn61cl1d33yd1jgqm8jpffjw3xlyyhkn032g14d9gnwkcaf4649"; </del> <ins> sha256 = "EYNLdrvSs8S/GCYy0jGsnP1+C988y1j7WzcLfczM1Ew="; </ins> }; nativeBuildInputs = [


owner = "OpenMW"; repo = "openmw"; rev = name; <del> sha256 = "0lj8v81hk807dy0wcdhfp0iyn4l5yag53hx1a6xm44gh2dpyil43"; </del> <ins> sha256 = "1nybxwp77qswjayf0g9xayp4x1xxq799681rhjlggch127r07ifi"; </ins> }; enableParallelBuilding = true;


<xi:include href="beam.xml" /> <xi:include href="bower.xml" /> <xi:include href="coq.xml" /> <ins> <xi:include href="gnome.xml" /> </ins> <xi:include href="go.xml" /> <xi:include href="haskell.section.xml" /> <xi:include href="idris.section.xml" />


<ins> diff -Naur mpd-0.19.9.orig/configure mpd-0.19.9/configure --- mpd-0.19.9.orig/configure	2015-01-26 19:47:27.000000000 +0000 +++ mpd-0.19.9/configure	2015-01-26 19:47:27.000000000 +0000 @@ -17113,138 +17113,6 @@ done -if test x$no_exceptions = xyes; then - - - - -for flag in -fno-exceptions; do -  as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5 -$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; } -if eval ${$as_CACHEVAR+:} false; then : -  $as_echo_n "(cached) " >&6 -else - -  ax_check_save_flags=$CXXFLAGS -  CXXFLAGS="$CXXFLAGS  $flag" -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h.  */ - -int -main () -{ - -  ; -  return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : -  eval "$as_CACHEVAR=yes" -else -  eval "$as_CACHEVAR=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -  CXXFLAGS=$ax_check_save_flags -fi -eval ac_res=$$as_CACHEVAR -	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then : -  if ${CXXFLAGS+:} false; then : -  case " $CXXFLAGS " in -    *" $flag "*) -      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains $flag"; } >&5 -  (: CXXFLAGS already contains $flag) 2>&5 -  ac_status=$? -  $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 -  test $ac_status = 0; } -      ;; -    *) -      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS="$CXXFLAGS $flag""; } >&5 -  (: CXXFLAGS="$CXXFLAGS $flag") 2>&5 -  ac_status=$? -  $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 -  test $ac_status = 0; } -      CXXFLAGS="$CXXFLAGS $flag" -      ;; -   esac -else -  CXXFLAGS="$flag" -fi - -else -  : -fi - -done - - - - - -for flag in -fno-rtti; do -  as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__$flag" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5 -$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; } -if eval ${$as_CACHEVAR+:} false; then : -  $as_echo_n "(cached) " >&6 -else - -  ax_check_save_flags=$CXXFLAGS -  CXXFLAGS="$CXXFLAGS  $flag" -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h.  */ - -int -main () -{ - -  ; -  return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : -  eval "$as_CACHEVAR=yes" -else -  eval "$as_CACHEVAR=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -  CXXFLAGS=$ax_check_save_flags -fi -eval ac_res=$$as_CACHEVAR -	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then : -  if ${CXXFLAGS+:} false; then : -  case " $CXXFLAGS " in -    *" $flag "*) -      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains $flag"; } >&5 -  (: CXXFLAGS already contains $flag) 2>&5 -  ac_status=$? -  $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 -  test $ac_status = 0; } -      ;; -    *) -      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS="$CXXFLAGS $flag""; } >&5 -  (: CXXFLAGS="$CXXFLAGS $flag") 2>&5 -  ac_status=$? -  $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 -  test $ac_status = 0; } -      CXXFLAGS="$CXXFLAGS $flag" -      ;; -   esac -else -  CXXFLAGS="$flag" -fi - -else -  : -fi - -done - -fi </ins>


<del> { stdenv, lib, fetchFromGitHub, cmake, nasm , gtk2, glib, ffmpeg_4, alsa-lib, libmad, libogg, libvorbis , glew, libpulseaudio, udev </del> <ins> { lib , stdenv , fetchFromGitHub , fetchpatch , cmake , nasm , alsa-lib , ffmpeg_6 , glew , glib , gtk2 , libmad , libogg , libpulseaudio , libvorbis , udev , xorg </ins> }: <del> stdenv.mkDerivation rec { </del> <ins> stdenv.mkDerivation { </ins> pname = "stepmania"; <del> version = "5.1.0-b2"; </del> <ins> version = "5.1.0-b2-unstable-2022-11-14"; </ins> src = fetchFromGitHub { owner = "stepmania"; repo  = "stepmania"; <del> rev   = "v${version}"; sha256 = "0a7y9l7xm510vgnpmj1is7p9m6d6yd0fcaxrjcickz295k5w3rdn"; </del> <ins> rev   = "d55acb1ba26f1c5b5e3048d6d6c0bd116625216f"; hash = "sha256-49H2Q61R4l/G0fWsjCjiAUXeWwG3lcsDpV5XvR3l3QE="; </ins> }; patches = [ <del> ./0001-fix-build-with-ffmpeg-4.patch </del> <ins> # https://github.com/stepmania/stepmania/pull/2247 (fetchpatch { name = "fix-building-with-ffmpeg6.patch"; url = "https://github.com/stepmania/stepmania/commit/3fef5ef60b7674d6431f4e1e4ba8c69b0c21c023.patch"; hash = "sha256-m+5sP+mIpcSjioRBdzChqja5zwNcwdSNAfvSJ2Lww+g="; }) </ins> ]; postPatch = ''


--log-config-json $out/share/immich/log_conf.json" ''; <ins> passthru.tests = { inherit (nixosTests) immich; }; </ins> meta = { description = "Self-hosted photo and video backup solution (machine learning component)"; homepage = "https://immich.app/";


nativeBuildInputs = [ nukeReferences <ins> pkg-config </ins> xz ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];


}: let pname = "polars"; <del> version = "0.20.0"; </del> <ins> version = "0.19.12"; </ins> rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars";


{ lib <del> , stdenv , fetchFromGitHub </del> , rustPlatform <ins> , fetchFromGitHub , stdenv </ins> , Security }: rustPlatform.buildRustPackage rec { pname = "routinator"; <del> version = "0.10.1"; </del> <ins> version = "0.10.2"; </ins> src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; <del> sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y="; </del> <ins> sha256 = "0a2iwpmljkha6qlbw0373wph7pxz05qym5712vzbszw0z42f82l2"; </ins> }; cargoPatches = [ ./Cargo.toml.patch ]; <del> cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM="; </del> <ins> cargoSha256 = "0l3fhwgrdvjrlmiqdy90sfd8kb2s7y0lbfswlrr560ly0bi1lfbx"; </ins> buildInputs = lib.optionals stdenv.isDarwin [ Security ]; <ins> buildNoDefaultFeatures = true; buildFeatures = [ "socks" ]; </ins> meta = with lib; { description = "An RPKI Validator written in Rust"; homepage = "https://github.com/NLnetLabs/routinator"; <ins> changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md"; </ins> license = licenses.bsd3; maintainers = with maintainers; [ _0x4A6F ]; <del> platforms = platforms.all; </del> }; }


getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; <del> version = "2.5.1"; </del> <ins> version = "2.8.0"; </ins> channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; # Decouples flutter derivation from dart derivation, # use specific dart version to not need to bump dart derivation when bumping flutter. <del> dartVersion = "2.14.2"; </del> <ins> dartVersion = "2.15.0"; </ins> dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; dartForFlutter = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchurl { url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; <del> sha256 = "1gr2dr683kz0a0k6rcn4jcbxf9fr2xlzi5fcgn1lzrrxvys2lddx"; </del> <ins> sha256 = "sha256-U1V1OPmFeNZCdBxFy7yqAbAE0cxh9f2UqKQmreJu9YA="; </ins> }; }; };


<ins> { lib , stdenv , fetchFromGitHub , cmake }: stdenv.mkDerivation (finalAttrs: { pname = "iir1"; version = "1.9.4"; src = fetchFromGitHub { owner = "berndporr"; repo = "iir1"; rev = finalAttrs.version; hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs="; }; nativeBuildInputs = [ cmake ]; meta = { homepage = "https://berndporr.github.io/iir1/"; description = "A DSP IIR realtime filter library written in C++"; downloadPage = "https://github.com/berndporr/iir1"; changelog = "https://github.com/berndporr/iir1/releases/tag/${finalAttrs.src.rev}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; }; }) </ins>


buildInputs = [ libnl ]; preBuild = '' <del> makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" </del> <ins> makeFlags="PREFIX=$out" </ins> ''; meta = {


, fetchurl , makeWrapper , makeDesktopItem <del> # sweethome3d 6.5.2 does not yet fully build&run with jdk 9 and later? , jdk8 , jre8 </del> <ins> , jdk </ins> , ant , gtk3 , gsettings-desktop-schemas


sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l"; }; <ins> # This patch is required for version 2.2.1. As the patch is already part of # upstream master, it will be incorporated into the next release. The patch # fixes a (well-justified) compiler warning which breaks the build because # we compile with -Werror. patches = [ (fetchpatch { url = "https://github.com/Nuand/bladeRF/commit/163425d48a3b7d8c100d7295220d3648c050d0dd.patch"; sha256 = "1swsymlyxm3yk2k8l71z1fv0a5k2rmab02f0c7xkrvk683mq6yxw"; }) ]; </ins> nativeBuildInputs = [ pkgconfig ]; # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 buildInputs = [ cmake git doxygen help2man tecla libusb1 ]


# code refactoring of bcachefs-tools broke reading passphrases from stdin (vs. terminal) # upstream issue https://github.com/koverstreet/bcachefs-tools/issues/261 ./fix-encrypted-boot.patch <ins> # https://github.com/koverstreet/bcachefs-tools/pull/305 (fetchpatch { name = "use-ar-var-in-makefile.patch"; url = "https://github.com/koverstreet/bcachefs-tools/commit/91e67ab2bd48fa135a1f5109b23899a4f1019a03.patch"; sha256 = "sha256-nB4Tgcwa8eeasIDQ4rrYORie/X8LMuCSRi+WJNw+R/U="; }) </ins> ]; <ins> postPatch = '' substituteInPlace Makefile  --replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs" ''; </ins> preCheck = lib.optionalString (!fuseSupport) '' rm tests/test_fuse.py '';


--prefix LD_LIBRARY_PATH : ${libPath} ''; <del> postInstall = '' </del> <ins> postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r extra/osx/Neovide.app $out/Applications ln -s $out/bin $out/Applications/Neovide.app/Contents/MacOS '' + lib.optionalString stdenv.isLinux '' </ins> for n in 16x16 32x32 48x48 256x256; do install -m444 -D "assets/neovide-$n.png"  "$out/share/icons/hicolor/$n/apps/neovide.png"


buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out"; }; # 2.42 has the patch included <del> patches = optional (lib.versionOlder version "2.42") patchToUse; </del> <ins> patches = optional (lib.versionOlder version "2.42") patchToUse ++ optionals (lib.versionOlder version "2.46.0") [ (fetchpatch { name = "CVE-2020-18032.patch"; url = "https://gitlab.com/graphviz/graphviz/-/commit/784411ca3655c80da0f6025ab20634b2a6ff696b.patch"; sha256 = "1nkw9ism8lkfvxsp5fh95i2l5s5cbjsidbb3g1kjfv10rxkyb41m"; }) ]; </ins> in stdenv.mkDerivation {


# backends , enableDeckjsBackend ? false , enableOdfBackend ? false <ins> # java is problematic on some platforms, where it is unfree , enableJava ? true </ins> }: assert enableStandardFeatures ->


ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; <ins> fscrypt = handleTest ./fscrypt.nix {}; </ins> ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; emacs-daemon = handleTest ./emacs-daemon.nix {};


]; </programlisting> </para> <para> <del> You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function <literal>.withPackages</literal>. For example, creating a custom PostgreSQL package in an overlay can look like: </del> <ins> You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function <literal>.withPackages</literal>. For example, creating a custom PostgreSQL package in an overlay can look like: </ins> <programlisting> self: super: { postgresql_custom = self.postgresql_11.withPackages (ps: [


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


<del> diff --git a/llm/llama.go b/llm/llama.go index f23d5d8..6563550 100644 --- a/llm/llama.go +++ b/llm/llama.go @@ -25,7 +25,6 @@ import ( "github.com/jmorganca/ollama/api" ) -//go:embed llama.cpp/*/build/*/bin/* var llamaCppEmbed embed.FS type ModelRunner struct { @@ -33,6 +32,10 @@ type ModelRunner struct { } func chooseRunners(workDir, runnerType string) []ModelRunner { +	return []ModelRunner{ +		{Path: "@llamaCppServer@"}, +	} + buildPath := path.Join("llama.cpp", runnerType, "build") var runners []string </del>


pkg-config wayland xwayland <del> zig_0_12.hook </del> <ins> zig_0_13.hook </ins> ] ++ lib.optional withManpages scdoc;


, stdenv , buildPythonPackage , fetchPypi <del> , fetchpatch </del> , substituteAll , pythonOlder , geos


paths = cuda-common-redist; }; in <del> stdenv.mkDerivation (finalAttrs: { name = "tiny-cuda-nn"; version = "1.6"; format = strings.optionalString pythonSupport "setuptools"; src = fetchFromGitHub { owner = "NVlabs"; repo = finalAttrs.name; rev = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; }; nativeBuildInputs = [ cmake cuda-native-redist ninja which ] ++ lists.optionals pythonSupport (with python3Packages; [ pip setuptools wheel ]); buildInputs = [ cuda-redist ] ++ lib.optionals pythonSupport ( with python3Packages; [ pybind11 python ] ); propagatedBuildInputs = lib.optionals pythonSupport ( with python3Packages; [ torch ] ); # NOTE: We cannot use pythonImportsCheck for this module because it uses torch to immediately #   initailize CUDA and GPU access is not allowed in the nix build environment. # NOTE: There are no tests for the C++ library or the python bindings, so we just skip the check #   phase -- we're not missing anything. doCheck = false; preConfigure = '' export TCNN_CUDA_ARCHITECTURES=${ strings.concatStringsSep ";" (lists.map cudaFlags.dropDot cudaFlags.cudaCapabilities) } export CUDA_HOME=${cuda-native-redist} export LIBRARY_PATH=${cuda-native-redist}/lib/stubs:$LIBRARY_PATH export CC=${backendStdenv.cc}/bin/cc export CXX=${backendStdenv.cc}/bin/c++ ''; # When building the python bindings, we cannot re-use the artifacts from the C++ build so we # skip the CMake confurePhase and the buildPhase. dontUseCmakeConfigure = pythonSupport; # The configurePhase usually puts you in the build directory, so for the python bindings we # need to change directories to the source directory. configurePhase = strings.optionalString pythonSupport '' runHook preConfigure mkdir -p $NIX_BUILD_TOP/build cd $NIX_BUILD_TOP/build runHook postConfigure ''; buildPhase = strings.optionalString pythonSupport '' runHook preBuild python -m pip wheel  --no-build-isolation  --no-clean  --no-deps  --no-index  --verbose  --wheel-dir $NIX_BUILD_TOP/build  $NIX_BUILD_TOP/source/bindings/torch runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/lib '' # Installing the C++ library just requires copying the static library to the output directory + strings.optionalString (!pythonSupport) '' cp libtiny-cuda-nn.a $out/lib/ '' # Installing the python bindings requires building the wheel and installing it + strings.optionalString pythonSupport '' python -m pip install  --no-build-isolation  --no-cache-dir  --no-deps  --no-index  --no-warn-script-location  --prefix="$out"  --verbose  ./*.whl '' + '' runHook postInstall ''; passthru = { inherit cudaPackages; }; meta = with lib; { description = "Lightning fast C++/CUDA neural network framework"; homepage = "https://github.com/NVlabs/tiny-cuda-nn"; license = licenses.bsd3; maintainers = with maintainers; [ connorbaker ]; platforms = platforms.linux; }; }) </del> <ins> stdenv.mkDerivation (finalAttrs: { pname = "tiny-cuda-nn"; version = "1.6"; strictDeps = true; format = strings.optionalString pythonSupport "setuptools"; src = fetchFromGitHub { owner = "NVlabs"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; }; nativeBuildInputs = [ cmake cuda-native-redist ninja which ] ++ lists.optionals pythonSupport (with python3Packages; [ pip setuptools wheel ]); buildInputs = [ cuda-redist ] ++ lib.optionals pythonSupport ( with python3Packages; [ pybind11 python ] ); propagatedBuildInputs = lib.optionals pythonSupport ( with python3Packages; [ torch ] ); # NOTE: We cannot use pythonImportsCheck for this module because it uses torch to immediately #   initailize CUDA and GPU access is not allowed in the nix build environment. # NOTE: There are no tests for the C++ library or the python bindings, so we just skip the check #   phase -- we're not missing anything. doCheck = false; preConfigure = '' export TCNN_CUDA_ARCHITECTURES="${ strings.concatStringsSep ";" (lists.map cudaFlags.dropDot cudaFlags.cudaCapabilities) }" export CUDA_HOME="${cuda-native-redist}" export LIBRARY_PATH="${cuda-native-redist}/lib/stubs:$LIBRARY_PATH" export CC="${backendStdenv.cc}/bin/cc" export CXX="${backendStdenv.cc}/bin/c++" ''; # When building the python bindings, we cannot re-use the artifacts from the C++ build so we # skip the CMake confurePhase and the buildPhase. dontUseCmakeConfigure = pythonSupport; # The configurePhase usually puts you in the build directory, so for the python bindings we # need to change directories to the source directory. configurePhase = strings.optionalString pythonSupport '' runHook preConfigure mkdir -p "$NIX_BUILD_TOP/build" cd "$NIX_BUILD_TOP/build" runHook postConfigure ''; buildPhase = strings.optionalString pythonSupport '' runHook preBuild python -m pip wheel  --no-build-isolation  --no-clean  --no-deps  --no-index  --verbose  --wheel-dir "$NIX_BUILD_TOP/build"  "$NIX_BUILD_TOP/source/bindings/torch" runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p "$out/lib" '' # Installing the C++ library just requires copying the static library to the output directory + strings.optionalString (!pythonSupport) '' cp libtiny-cuda-nn.a "$out/lib/" '' # Installing the python bindings requires building the wheel and installing it + strings.optionalString pythonSupport '' python -m pip install  --no-build-isolation  --no-cache-dir  --no-deps  --no-index  --no-warn-script-location  --prefix="$out"  --verbose  ./*.whl '' + '' runHook postInstall ''; passthru = { inherit cudaPackages; }; meta = with lib; { description = "Lightning fast C++/CUDA neural network framework"; homepage = "https://github.com/NVlabs/tiny-cuda-nn"; license = licenses.bsd3; maintainers = with maintainers; [connorbaker]; platforms = platforms.linux; }; }) </ins>


<ins> { lib, stdenvNoCC, fetchFromGitHub, glib, # These loosen security a bit, so we don't install them by default. See also: # https://github.com/hardpixel/systemd-manager?tab=readme-ov-file#without-password-prompt allowPolkitPolicy ? "none", config, systemd ? config.systemd.package, }: assert lib.elem allowPolkitPolicy [ "none" "pkexec" "systemctl" ]; stdenvNoCC.mkDerivation rec { pname = "gnome-shell-extension-systemd-manager"; version = "16"; # Upstream doesn't post new versions in extensions.gnome.org anymore, see also: # https://github.com/hardpixel/systemd-manager/issues/19 src = fetchFromGitHub { owner = "hardpixel"; repo = "systemd-manager"; rev = "v${version}"; hash = "sha256-JecSIRj582jJWdrCQYBWFRkIhosxRhD3BxSAy8/0nVw="; }; nativeBuildInputs = [ glib ]; postInstall = '' rm systemd-manager@hardpixel.eu/schemas/gschemas.compiled glib-compile-schemas systemd-manager@hardpixel.eu/schemas mkdir -p $out/share/gnome-shell/extensions mv systemd-manager@hardpixel.eu $out/share/gnome-shell/extensions '' + lib.optionalString (allowPolkitPolicy == "pkexec") '' local bn=org.freedesktop.policykit.pkexec.systemctl.policy mkdir -p $out/share/polkit-1/actions substitute systemd-policies/$bn $out/share/polkit-1/actions/$bn  --replace-fail /usr/bin/systemctl ${lib.getBin systemd}/bin/systemctl '' + lib.optionalString (allowPolkitPolicy == "systemctl") '' install -Dm0644  systemd-policies/10-service_status.rules  $out/share/polkit-1/rules.d/10-gnome-extension-systemd-manager.rules ''; passthru = { extensionUuid = "systemd-manager@hardpixel.eu"; extensionPortalSlug = "systemd-manager"; }; meta = with lib; { description = "GNOME Shell extension to manage systemd services"; homepage = "https://github.com/hardpixel/systemd-manager"; license = licenses.gpl3Only; maintainers = with maintainers; [ linsui doronbehar ]; }; } </ins>


githubId = 1891350; name = "Michael Raskin"; }; <ins> raspher = { email = "raspher@protonmail.com"; github = "raspher"; githubId = 23345803; name = "Szymon Scholz"; }; </ins> ratcornu = { email = "ratcornu@skaven.org"; github = "RatCornu";


<del> { lib, ocamlPackages, fetchFromGitHub, python3, dune_3, makeWrapper, poppler_utils }: </del> <ins> { lib, ocamlPackages, fetchFromGitHub, python3, dune_3, makeWrapper, poppler_utils, fzf }: </ins> ocamlPackages.buildDunePackage rec { pname = "docfd";


cfg = config.environment; <del> pamProfiles = map (replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"]) cfg.profiles; </del> in {


<ins> From d3cb66e4751fcbd581b81a14a973de2d78fc02ad Mon Sep 17 00:00:00 2001 From: Liu Hao <lh_mouse@126.com> Date: Mon, 18 Apr 2016 11:50:55 +0800 Subject: [PATCH] Added 'mcf' thread model support from mcfgthread. Signed-off-by: Liu Hao <lh_mouse@126.com> --- config/gthr.m4                          |  1 + gcc/config.gcc                          |  3 +++ gcc/config/i386/mingw-mcfgthread.h      |  1 + gcc/config/i386/mingw-w64.h             |  2 +- gcc/config/i386/mingw32.h               | 11 ++++++++++- gcc/configure                           |  2 +- gcc/configure.ac                        |  2 +- libatomic/configure.tgt                 |  2 +- libgcc/config.host                      |  6 ++++++ libgcc/config/i386/gthr-mcf.h           |  1 + libgcc/config/i386/t-mingw-mcfgthread   |  2 ++ libgcc/configure                        |  1 + libstdc++-v3/configure                  |  1 + libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++ libstdc++-v3/libsupc++/guard.cc         | 23 +++++++++++++++++++++++ 15 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 gcc/config/i386/mingw-mcfgthread.h create mode 100644 libgcc/config/i386/gthr-mcf.h create mode 100644 libgcc/config/i386/t-mingw-mcfgthread diff --git a/config/gthr.m4 b/config/gthr.m4 index 7b29f1f3327..82e21fe1709 100644 --- a/config/gthr.m4 +++ b/config/gthr.m4 @@ -21,6 +21,7 @@ case $1 in tpf)	thread_header=config/s390/gthr-tpf.h ;; vxworks)	thread_header=config/gthr-vxworks.h ;; win32)	thread_header=config/i386/gthr-win32.h ;; +    mcf)	thread_header=config/i386/gthr-mcf.h ;; esac AC_SUBST(thread_header) ]) diff --git a/gcc/config.gcc b/gcc/config.gcc index 8f91197f34e..59db37cac04 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1719,6 +1719,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) if test x$enable_threads = xposix ; then tm_file="${tm_file} i386/mingw-pthread.h" fi +	if test x$enable_threads = xmcf ; then +		tm_file="${tm_file} i386/mingw-mcfgthread.h" +	fi tm_file="${tm_file} i386/mingw32.h" # This makes the logic if mingw's or the w64 feature set has to be used case ${target} in diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h new file mode 100644 index 00000000000..ec381a7798f --- /dev/null +++ b/gcc/config/i386/mingw-mcfgthread.h @@ -0,0 +1 @@ +#define TARGET_USE_MCFGTHREAD 1 diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h index 270ec0dd037..88966f79695 100644 --- a/gcc/config/i386/mingw-w64.h +++ b/gcc/config/i386/mingw-w64.h @@ -48,7 +48,7 @@ along with GCC; see the file COPYING3.  If not see "%{mwindows:-lgdi32 -lcomdlg32} "  "%{fvtable-verify=preinit:-lvtv -lpsapi;  fvtable-verify=std:-lvtv -lpsapi} "  -		 "-ladvapi32 -lshell32 -luser32 -lkernel32" +		 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" #undef SPEC_32 #undef SPEC_64 diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index e5f014cb473..989cfbe894e 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -32,6 +32,14 @@ along with GCC; see the file COPYING3.  If not see | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE  | MASK_MS_BITFIELD_LAYOUT) +#ifndef TARGET_USE_MCFGTHREAD +#define CPP_MCFGTHREAD()  ((void)0) +#define LIB_MCFGTHREAD     "" +#else +#define CPP_MCFGTHREAD()  (builtin_define("__USING_MCFGTHREAD__")) +#define LIB_MCFGTHREAD     " -lmcfgthread " +#endif + /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS is for compatibility with native compiler.  */ #define EXTRA_OS_CPP_BUILTINS()					 @@ -50,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see builtin_define_std ("WIN64");				 builtin_define ("_WIN64");				 }							 +	CPP_MCFGTHREAD();	 }								 while (0) @@ -93,7 +102,7 @@ along with GCC; see the file COPYING3.  If not see "%{mwindows:-lgdi32 -lcomdlg32} "  "%{fvtable-verify=preinit:-lvtv -lpsapi;  fvtable-verify=std:-lvtv -lpsapi} "  -                 "-ladvapi32 -lshell32 -luser32 -lkernel32" +                 LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" /* Weak symbols do not get resolved if using a Windows dll import lib. Make the unwind registration references strong undefs.  */ diff --git a/gcc/configure b/gcc/configure index ea73b151a4e..317200e5620 100755 --- a/gcc/configure +++ b/gcc/configure @@ -11681,7 +11681,7 @@ case ${enable_threads} in target_thread_file='single' ;; aix | dce | lynx | mipssde | posix | rtems |  -  single | tpf | vxworks | win32) +  single | tpf | vxworks | win32 | mcf) target_thread_file=${enable_threads} ;; *) diff --git a/gcc/configure.ac b/gcc/configure.ac index 9d4c792a33f..d51899a5676 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1612,7 +1612,7 @@ case ${enable_threads} in target_thread_file='single' ;; aix | dce | lynx | mipssde | posix | rtems |  -  single | tpf | vxworks | win32) +  single | tpf | vxworks | win32 | mcf) target_thread_file=${enable_threads} ;; *) diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt index b8af3ab2546..73248438a8c 100644 --- a/libatomic/configure.tgt +++ b/libatomic/configure.tgt @@ -125,7 +125,7 @@ case "${target}" in *-*-mingw*) # OS support for atomic primitives. case ${target_thread_file} in -          win32) +          win32 | mcf) config_path="${config_path} mingw" ;; posix) diff --git a/libgcc/config.host b/libgcc/config.host index b279a6458f9..20d22f585da 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -710,6 +710,9 @@ i[34567]86-*-mingw*) posix) tmake_file="i386/t-mingw-pthread $tmake_file" ;; +	  mcf) +	    tmake_file="i386/t-mingw-mcfgthread $tmake_file" +	    ;; esac # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h if test x$ac_cv_sjlj_exceptions = xyes; then @@ -734,6 +737,9 @@ x86_64-*-mingw*) posix) tmake_file="i386/t-mingw-pthread $tmake_file" ;; +	  mcf) +	    tmake_file="i386/t-mingw-mcfgthread $tmake_file" +	    ;; esac # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h if test x$ac_cv_sjlj_exceptions = xyes; then diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h new file mode 100644 index 00000000000..5ea2908361f --- /dev/null +++ b/libgcc/config/i386/gthr-mcf.h @@ -0,0 +1 @@ +#include <mcfgthread/gthread.h> diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread new file mode 100644 index 00000000000..4b9b10e32d6 --- /dev/null +++ b/libgcc/config/i386/t-mingw-mcfgthread @@ -0,0 +1,2 @@ +SHLIB_PTHREAD_CFLAG = +SHLIB_PTHREAD_LDFLAG = -lmcfgthread diff --git a/libgcc/configure b/libgcc/configure index 45c459788c3..8fc569ef16e 100644 --- a/libgcc/configure +++ b/libgcc/configure @@ -5086,6 +5086,7 @@ case $target_thread_file in tpf)	thread_header=config/s390/gthr-tpf.h ;; vxworks)	thread_header=config/gthr-vxworks.h ;; win32)	thread_header=config/i386/gthr-win32.h ;; +    mcf)	thread_header=config/i386/gthr-mcf.h ;; esac diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 2406cb9d946..50e7e4ced89 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -15182,6 +15182,7 @@ case $target_thread_file in tpf)	thread_header=config/s390/gthr-tpf.h ;; vxworks)	thread_header=config/gthr-vxworks.h ;; win32)	thread_header=config/i386/gthr-win32.h ;; +    mcf)	thread_header=config/i386/gthr-mcf.h ;; esac diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc index 923a0707556..a55d85aad2d 100644 --- a/libstdc++-v3/libsupc++/atexit_thread.cc +++ b/libstdc++-v3/libsupc++/atexit_thread.cc @@ -25,6 +25,22 @@ #include <cstdlib> #include <new> #include "bits/gthr.h" + +#ifdef __USING_MCFGTHREAD__ + +#include <mcfgthread/gthread.h> + +extern "C" int +__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), +				 void *obj, void *dso_handle) +  _GLIBCXX_NOTHROW +{ +  return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; +  (void)dso_handle; +} + +#else // __USING_MCFGTHREAD__ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha } #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */ + +#endif // __USING_MCFGTHREAD__ diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc index 19953bc52f0..72fd5f26d5b 100644 --- a/libstdc++-v3/libsupc++/guard.cc +++ b/libstdc++-v3/libsupc++/guard.cc @@ -28,6 +28,27 @@ #include <cxxabi.h> #include <exception> #include <new> + +#ifdef __USING_MCFGTHREAD__ + +#include <mcfgthread/gthread.h> + +namespace __cxxabiv1 { + +extern "C" int __cxa_guard_acquire(__guard *g){ +	return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial; +} +extern "C" void __cxa_guard_abort(__guard *g) throw() { +	::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g); +} +extern "C" void __cxa_guard_release(__guard *g) throw() { +	::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g); +} + +} + +#else // __USING_MCFGTHREAD__ + #include <ext/atomicity.h> #include <ext/concurrence.h> #include <bits/atomic_lockfree_defines.h> @@ -425,3 +446,5 @@ namespace __cxxabiv1 #endif } } + +#endif -- 2.12.1 </ins>


<ins> { lib, buildPythonPackage, fetchPypi, pythonOlder }: buildPythonPackage rec { pname = "pathvalidate"; version = "2.4.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "sha256-PJvZTH7CPpz7IR/741audfl51sCZosdF7pSQ9STzJGg="; }; # Requires `pytest-md-report`, causing infinite recursion. doCheck = false; pythonImportsCheck = [ "pathvalidate" ]; meta = with lib; { description = "A Python library to sanitize/validate a string such as filenames/file-paths/etc"; homepage = "https://github.com/thombashi/pathvalidate"; license = licenses.mit; maintainers = with maintainers; [ oxalica ]; }; } </ins>


burp = callPackage ../tools/backup/burp { }; <del> buku = callPackage ../applications/misc/buku { }; </del> <ins> buku = callPackage ../applications/misc/buku { python3 = python36; # due to #52766 }; </ins> byzanz = callPackage ../applications/video/byzanz {};


++ lib.optional (enableStatic && enableShared) "static"; buildInputs = lib.optional pythonSupport python <ins> ++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext </ins> ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses # Libxml2 has an optional dependency on liblzma.  However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a


<ins> { stdenv, fetchurl, ncurses }: stdenv.mkDerivation { name = "watch-0.2.0"; src = fetchurl { url = http://procps.sourceforge.net/procps-3.2.8.tar.gz; sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i"; }; buildInputs = [ ncurses ]; makeFlags = "watch usrbin_execdir=$(out)/bin" + (if stdenv.isDarwin then " PKG_LDFLAGS=" else ""); enableParallelBuilding = true; crossAttrs = { CC = stdenv.cross.config + "-gcc"; }; installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin"; meta = { homepage = http://sourceforge.net/projects/procps/; description = "Utility for watch the output of a given command at intervals"; platforms = stdenv.lib.platforms.unix; }; } </ins>


<del> { lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: </del> <ins> { lib , stdenv , fetchurl , autoreconfHook , pkg-config , fftw , withFftw3 ? true }: </ins> stdenv.mkDerivation rec { pname = "speexdsp";


}; }; <ins> imperative = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; # add a virtual wlan interface boot.kernelModules = [ "mac80211_hwsim" ]; # wireless client networking.wireless = { enable = lib.mkOverride 0 true; userControlled.enable = true; allowAuxiliaryImperativeNetworks = true; interfaces = [ "wlan1" ]; }; }; </ins> # Test connecting to the SAE-only hotspot using SAE machineSae = machineWithHostapd { networking.wireless = {


diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs <del> index 4b432785..fa45e87e 100644 </del> <ins> index 3beddf54..0f859b8d 100644 </ins> --- a/src/dist/component/package.rs +++ b/src/dist/component/package.rs <del> @@ -109,10 +109,11 @@ impl Package for DirectoryPackage { match &*part.0 { "file" => { if self.copy { -                        builder.copy_file(path.clone(), &src_path)? +                        builder.copy_file(path.clone(), &src_path)?; </del> <ins> @@ -113,6 +113,7 @@ impl Package for DirectoryPackage { </ins> } else { <del> -                        builder.move_file(path.clone(), &src_path)? +                        builder.move_file(path.clone(), &src_path)?; </del> <ins> builder.move_file(path.clone(), &src_path)? </ins> } +                    nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path) } "dir" => { if self.copy { <del> @@ -135,6 +136,22 @@ impl Package for DirectoryPackage { </del> <ins> @@ -135,6 +136,29 @@ impl Package for DirectoryPackage { </ins> } } +fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { <del> +    let is_bin = if let Some(p) = src_path.parent() { +        p.ends_with("bin") </del> <ins> +    let (is_bin, is_lib) = if let Some(p) = src_path.parent() { +        (p.ends_with("bin"), p.ends_with("lib")) </ins> +    } else { <del> +        false </del> <ins> +        (false, false) </ins> +    }; + +    if is_bin {


chmod +x $out/bin/igv chmod +x $out/bin/igvtools ''; <ins> nativeBuildInputs = [ wrapGAppsHook ]; </ins> meta = with lib; { homepage = "https://www.broadinstitute.org/igv/";


<ins> { lib, buildPythonPackage, fetchPypi, pefile, pillow}: buildPythonPackage rec { pname = "icoextract"; version = "0.1.4"; src = fetchPypi { inherit pname version; extension = "tar.gz"; sha256 = "sha256-x0GEV0PUbkAzoUJgAqup9bHd7iYttGyzIZNdo8KsFyo="; }; propagatedBuildInputs = [ pefile pillow ]; # tests expect mingw and multiarch doCheck = false; pythonImportsCheck = [ "icoextract" ]; meta = with lib; { description = "Extract icons from Windows PE files"; homepage = "https://github.com/jlu5/icoextract"; license = licenses.mit; maintainers = with maintainers; [ bryanasdev000 ]; }; } </ins>


buildPythonPackage rec { pname = "Shapely"; <del> version = "1.8.2"; </del> <ins> version = "1.8.4"; </ins> disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; <del> sha256 = "sha256-Vyr51QBv1eMhPjfuVIkSsDQfsmck1tyKTjlQwQGX67Y="; </del> <ins> sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; </ins> }; nativeBuildInputs = [


"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; <del> sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp"; </del> <ins> sha256 = "0awiyvicvcn3b18x0vx5ik3ly0k3k51ivz2ljj8pnx6ms95nyp2n"; </ins> }; prePatch = "patchShebangs .";


--replace "include (''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" "" --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" <del> cat << EOF > python/triton/common/build.py </del> <ins> cat << EOF >> python/triton/common/build.py </ins> def libcuda_dirs(): return [ "${addDriverRunpath.driverLink}/lib" ] EOF


# does not contain any tests doCheck = false; <ins> enableParallelBuilding = true; </ins> pythonImportsCheck = [ "grpc" ]; meta = with lib; {


# Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin --add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" <ins> --add-flags ${lib.escapeShellArg commandLineArgs} </ins> ) '';


meson ninja pkg-config <del> python3 </del> wrapGAppsHook4 ] ++ (with rustPlatform; [ cargoSetupHook


SystemCallFilter = [ "@system-service" <del> "~@resources" </del> "~@privileged" ]; SystemCallArchitectures = "native";


<del> { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "pritunl-client"; </del> <ins> { lib , stdenv , fetchFromGitHub , runtimeShell , runCommand , makeWrapper , installShellFiles , buildGoModule , coreutils , which , gnugrep , gnused , openresolv , systemd , iproute2 , openvpn , electron }: let </ins> version = "1.3.3584.5"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron";


#!/usr/bin/env nix-shell <del> #! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git </del> <ins> #! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git </ins> import click import click_log


julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15 julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13 julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 <ins> julia_17-bin = throw "julia_17-bin has been deprecated in favor of the latest stable version"; # Added 2022-09-04 </ins> json_glib = throw "'json_glib' has been renamed to/replaced by 'json-glib'"; # Converted to throw 2022-02-22 jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15


# Allow multiple colon-separated authorized keys files to be # specified in the file= option. ./multiple-key-files.patch <ins> ./edcsa-crash-fix.patch </ins> ]; configureFlags = [


sourceRoot = if stdenv.isDarwin then "" else "."; in callPackage ./generic.nix rec { <del> inherit sourceRoot; </del> <ins> inherit sourceRoot commandLineArgs; </ins> # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem.


clojure-vim/vim-jack-in cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail <ins> coc-extensions/coc-svelte </ins> cocopon/iceberg.vim codota/tabnine-vim cohama/lexima.vim


if [[ ! -e .git || ! -e VERSION ]]; then echo "${version}" > VERSION fi # Patch shebangs for script run during build patchShebangs --build "$configureScript" makeit e2e scripts mlocal/scripts # Patching the hard-coded defaultPath by prefixing the packages in defaultPathInputs substituteInPlace cmd/internal/cli/actions.go  --replace "defaultPath = "${defaultPathOriginal}"" "defaultPath = "''${defaultPathInputs// //bin:}''${defaultPathInputs:+/bin:}${defaultPathOriginal}"" <ins> substituteInPlace internal/pkg/util/gpu/nvidia.go  --replace  'return fmt.Errorf("/usr/bin not writable in the container")'  "" </ins> ''; postConfigure = ''


</listitem> <listitem> <para> <ins> The <literal>miller</literal> package has been upgraded from 5.10.3 to <link xlink:href="https://github.com/johnkerl/miller/releases/tag/v6.2.0">6.2.0</link>. See <link xlink:href="https://miller.readthedocs.io/en/latest/new-in-miller-6">What’s new in Miller 6</link>. </para> </listitem> <listitem> <para> </ins> MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing


librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify  <ins> ''${gappsWrapperArgs[@]}  </ins> --prefix LD_LIBRARY_PATH : "$librarypath"  --prefix PATH : "${gnome.zenity}/bin"


} </programlisting> </para> <para> <del> Here's a recipe on how to override a particular plugin through an overlay: </del> <ins> Here's a recipe on how to override a particular plugin through an overlay: </ins> <programlisting> self: super: { postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // {


<del> { stdenv, lib, fetchFromGitHub, cmake, pkg-config , mpg123, ffmpeg, libvorbis, libao, jansson, speex </del> <ins> { stdenv, lib, fetchFromGitHub, cmake, pkg-config, gtk3 , audacious, mpg123, ffmpeg, libvorbis, libao, jansson, speex </ins> , nix-update-script <ins> , buildAudaciousPlugin ? false  # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support </ins> }: stdenv.mkDerivation rec {


extraInstallCommands = '' # Add desktop convencience stuff <del> mv $out/bin/{${name},${pname}} </del> <ins> mv $out/bin/{${pname}-*,${pname}} </ins> install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps substituteInPlace $out/share/applications/flexoptix-app.desktop


, xdg-dbus-proxy , substituteAll , glib <ins> , addOpenGLRunpath </ins> }: assert enableGeoLocation -> geoclue2 != null;


--replace "/etc/g810-led/profile" "${profile}" ''; <ins> # GCC 13 cannot find `uint16_t` and other similar types by default anymore env.CXXFLAGS = "-include cstdint"; </ins> buildInputs = [ hidapi ];


owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; <del> hash = "sha256-aweJys46MMnkSKJoLUFCzc6sWUP+Cv5+IFVVe9iEPGI="; </del> <ins> hash = "sha256-jWnke49b6inybPmiZOkxI3C8VoYe4Syi84YhvL8zxeI="; </ins> }; <del> vendorHash = "sha256-oELDIt+mRiBGAdoEUkSAs2SM6urkHm1aAtJnev8jDYM="; </del> <ins> vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4="; </ins> nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];


sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc"; }; <ins> patches = [ # Makes font a recognized media type. Committed upstream, but no release has been made. (fetchpatch { url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/commit/92af4108750ceaf4191fd54e255885c7d8a78b70.patch"; sha256 = "14sqy10p5skp6hv4hgiwnj9hpr460250x42k5z0390l6nr6gahsq"; }) ]; </ins> nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libintl ];


--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin"  --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt done <ins> substituteInPlace $out/bin/mix  --replace "/usr/bin/env elixir" "${coreutils}/bin/env $out/bin/elixir" </ins> ''; meta = with stdenv.lib; {


, wayland-scanner , libdrm , zlib <ins> , nixosTests </ins> # Set as 'false' to build monado without service support, i.e. allow VR # applications linking against libopenxr_monado.so to use OpenXR standalone # instead of via the monado-service program. For more information see:


yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz {}; <ins> yaru-theme = callPackage ../data/themes/yaru {}; </ins> zafiro-icons = callPackage ../data/icons/zafiro-icons { }; zeal = libsForQt5.callPackage ../data/documentation/zeal { };


configureFlags = common.configureFlags ++ [ "--without-x" ] # disable xdvik and xpdfopen ++ map (what: "--disable-${what}") ([ <ins> "chktex" </ins> "dvisvgm" "dvipng" # ghostscript dependency "luatex" "luajittex" "mp" "pmp" "upmp" "mf" # cairo would bring in X and more "xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small


<ins> [Nemo Action] Active=true Name=Open in Pulsar Comment=Open in Pulsar #%U is the current selected file, this will also work on current directory Exec=pulsar -n %U Icon-Name=pulsar Selection=any Extensions=any </ins>


# Whether to compile with SUID support , enableSuid ? false , starterSuidPath ? null <ins> , substituteAll </ins> # newuidmapPath and newgidmapPath are to support --fakeroot # where those SUID-ed executables are unavailable from the FHS system PATH. # Path to SUID-ed newuidmap executable


<ins> { buildGoPackage , fetchFromGitHub , lib }: # upstream is pretty stale, but it still works, so until they merge module # support we have to use gopath: see blynn/nex#57 buildGoPackage rec { pname = "nex"; version = "unstable-2021-03-30"; src = fetchFromGitHub { owner = "blynn"; repo = pname; rev = "1a3320dab988372f8910ccc838a6a7a45c8980ff"; hash = "sha256-DtJkV380T2B5j0+u7lYZfbC0ej0udF4GW2lbRmmbjAM="; }; goPackagePath = "github.com/blynn/nex"; subPackages = [ "." ]; meta = with lib; { description = "Lexer for Go"; homepage = "https://github.com/blynn/nex"; license = licenses.gpl3Only; maintainers = with maintainers; [ urandom ]; }; } </ins>


# require networking "tests/test_init.py" "tests/test_matching.py" <ins> "tests/providers/lyrics" "tests/types" "tests/utils/test_github.py" </ins> "tests/utils/test_m3u.py" "tests/utils/test_metadata.py" "tests/utils/test_search.py"


ecdsa = callPackage ../development/python-modules/ecdsa { }; <ins> echo = callPackage ../development/python-modules/echo { }; </ins> ecoaliface = callPackage ../development/python-modules/ecoaliface { }; ecos = callPackage ../development/python-modules/ecos { };


stdenv.mkDerivation rec { pname = "authenticator"; <del> version = "4.1.6"; </del> <ins> version = "4.2.0"; </ins> src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; <del> hash = "sha256-fv7Np3haRCJABlJocKuu+1jevHYrdo+VyiQBpRmHs2g="; </del> <ins> hash = "sha256-Nv4QE6gyh42Na/stAgTIapV8GQuUHCdL6IEO//J8dV8="; </ins> }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; <del> hash = "sha256-8GddlDM1lU365GXdrKNhO331/y1p3Om5uZfVLy8TBGI="; </del> <ins> hash = "sha256-IS9jdr19VvgX6M1OqM6rjE8veujZcwBuOTuDm5mDXso="; </ins> }; nativeBuildInputs = [


'' # Following is required to prevent a build error: # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it <del> + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") '' </del> <ins> + '' </ins> substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn  --replace '$sysroot/usr' "${darwin.xnu}" <del> '') </del> <ins> '' </ins> + '' # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm


postPatch = '' # relax version bounds <del> sed -i 's/([A-z0-9]*)~=.*$/1/' setup.cfg </del> <ins> sed -i -E 's/([A-z0-9]*)~=[^;]*(.*)/12/' setup.cfg </ins> ''; <del> propagatedBuildInputs = with python3.pkgs; [ bitmath certifi cheroot cryptography filetype flask flask-babel flask-caching flask-compress flask-session flask-themes2 js2py pycurl semver setuptools ]; </del> <ins> dependencies = with python3.pkgs; [ bitmath certifi cheroot cryptography filetype flask flask-babel flask-caching flask-compress flask-session flask-themes2 pycurl semver setuptools ] ++ (if pythonOlder "3.12" then [ js2py ] else [ dukpy ]); </ins> <del> passthru = { optional-dependencies = { plugins = with python3.pkgs; [ beautifulsoup4 # for some plugins colorlog # colorful console logging pillow # for some CAPTCHA plugin send2trash # send some files to trash instead of deleting them slixmpp # XMPP plugin ]; }; </del> <ins> optional-dependencies = { plugins = with python3.pkgs; [ beautifulsoup4 # for some plugins colorlog # colorful console logging pillow # for some CAPTCHA plugin send2trash # send some files to trash instead of deleting them slixmpp # XMPP plugin ]; }; </ins> <del> tests = { inherit (nixosTests) pyload; }; </del> <ins> passthru.tests = { inherit (nixosTests) pyload; </ins> }; <del> meta = with lib; { </del> <ins> meta = { </ins> description = "Free and open-source download manager with support for 1-click-hosting sites"; homepage = "https://github.com/pyload/pyload"; <del> license = licenses.agpl3Plus; maintainers = with maintainers; [ ruby0b ]; </del> <ins> license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ ruby0b ]; </ins> mainProgram = "pyload"; }; }


thrift beautifulsoup4 markdown2 <del> sqlalchemy7 </del> <ins> sqlalchemy </ins> html2text evernote ];


<del> GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. The licenses for most software and other practical works are designed to take away your freedom to share and change the works.  By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users.  We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors.  You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price.  Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights.  Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received.  You must make sure that they, too, receive or can get the source code.  And you must show them these terms so they know their rights. Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software.  For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so.  This is fundamentally incompatible with the aim of protecting users' freedom to change the software.  The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable.  Therefore, we have designed this version of the GPL to prohibit the practice for those products.  If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary.  To prevent this, the GPL assures that patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. TERMS AND CONDITIONS 0. Definitions. "This License" refers to version 3 of the GNU General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. "The Program" refers to any copyrightable work licensed under this License.  Each licensee is addressed as "you".  "Licensees" and "recipients" may be individuals or organizations. To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy.  The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. A "covered work" means either the unmodified Program or a work based on the Program. To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy.  Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. To "convey" a work means any kind of propagation that enables other parties to make or receive copies.  Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License.  If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. 1. Source Code. The "source code" for a work means the preferred form of the work for making modifications to it.  "Object code" means any non-source form of a work. A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form.  A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities.  However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work.  For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. The Corresponding Source for a work in source code form is that same work. 2. Basic Permissions. All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met.  This License explicitly affirms your unlimited permission to run the unmodified Program.  The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work.  This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force.  You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright.  Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. Conveying under any other circumstances is permitted solely under the conditions stated below.  Sublicensing is not allowed; section 10 makes it unnecessary. 3. Protecting Users' Legal Rights From Anti-Circumvention Law. No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. 4. Conveying Verbatim Copies. You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. 5. Conveying Modified Source Versions. You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: a) The work must carry prominent notices stating that you modified it, and giving a relevant date. b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7.  This requirement modifies the requirement in section 4 to "keep intact all notices". c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy.  This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged.  This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit.  Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. 6. Conveying Non-Source Forms. You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source.  This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge.  You need not require recipients to copy the Corresponding Source along with the object code.  If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source.  Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling.  In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage.  For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product.  A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. "Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source.  The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information.  But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed.  Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. 7. Additional Terms. "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law.  If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it.  (Additional permissions may be written to require their own removal in certain cases when you modify the work.)  You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or d) Limiting the use for publicity purposes of names of licensors or authors of the material; or e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10.  If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term.  If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. 8. Termination. You may not propagate or modify a covered work except as expressly provided under this License.  Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License.  If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. 9. Acceptance Not Required for Having Copies. You are not required to accept this License in order to receive or run a copy of the Program.  Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance.  However, nothing other than this License grants you permission to propagate or modify any covered work.  These actions infringe copyright if you do not accept this License.  Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. 10. Automatic Licensing of Downstream Recipients. Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License.  You are not responsible for enforcing compliance by third parties with this License. An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations.  If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License.  For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. 11. Patents. A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based.  The work thus licensed is called the contributor's "contributor version". A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version.  For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement).  To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients.  "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License.  You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. 12. No Surrender of Others' Freedom. If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License.  If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all.  For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. 13. Use with the GNU Affero General Public License. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work.  The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time.  Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number.  If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation.  If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. Later license versions may give you additional or different permissions.  However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. 15. Disclaimer of Warranty. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. Limitation of Liability. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 17. Interpretation of Sections 15 and 16. If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program.  It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year>  <name of author> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: <program>  Copyright (C) <year>  <name of author> This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License.  Of course, your program's commands might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>. The GNU General Public License does not permit incorporating your program into proprietary programs.  If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library.  If this is what you want to do, use the GNU Lesser General Public License instead of this License.  But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>. </del>


if (scalar (keys %unitsToStop) > 0) { print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "n" if scalar @unitsToStopFiltered; <del> system("systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? </del> <ins> # Use current version of systemctl binary before daemon is reexeced. system("/run/current-system/sw/bin/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors? </ins> } print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "n"


{ lib <ins> , stdenv </ins> , buildPythonPackage , fetchFromGitHub , fetchurl


massren = callPackage ../tools/misc/massren { }; <ins> mat2 = with python3.pkgs; toPythonApplication mat2; </ins> maxcso = callPackage ../tools/archivers/maxcso {}; medusa = callPackage ../tools/security/medusa { };


<del> { lib, stdenv, pkgs, fetchurl, wrapGAppsHook, gvfs, gtk3, atomEnv }: </del> <ins> { lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }: </ins> let versions = {


, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib <ins> , fetchpatch </ins> # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin


This chapter describes tools for creating various types of images. </para> <xi:include href="images/appimagetools.xml" /> <del> <xi:include href="images/dockertools.xml" /> </del> <ins> <xi:include href="images/dockertools.section.xml" /> </ins> <xi:include href="images/ocitools.xml" /> <xi:include href="images/snaptools.xml" /> </chapter>


removeReferencesTo unzip ] <del> ++ optionals withQt5 [ wrapQtAppsHook ]; </del> <ins> ++ optionals withQt5 [ wrapQtAppsHook ] ++ optionals waylandSupport [ wayland wayland-protocols ]; </ins> enableParallelBuilding = true;


# add the same environment vars to compile.sh sed -e "/$command $/a --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" "  -e "/$command $/a --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" "  <ins> -e "/$command $/a --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')" "  -e "/$command $/a --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')" "  </ins> -e "/$command $/a --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" "  -e "/$command $/a --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" "  -e "/$command $/a --host_javabase='@local_jdk//:jdk' "


<ins> <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-customising-packages"> <title>Customising Packages</title> <para> Some packages in Nixpkgs have options to enable or disable optional functionality or change other aspects of the package. For instance, the Firefox wrapper package (which provides Firefox with a set of plugins such as the Adobe Flash player) has an option to enable the Google Talk plugin. It can be set in <literal>configuration.nix</literal> as follows: <literal>nixpkgs.config.firefox.enableGoogleTalkPlugin = true;</literal> </para> <warning> <para> Unfortunately, Nixpkgs currently lacks a way to query available configuration options. </para> </warning> <para> Apart from high-level options, it’s possible to tweak a package in almost arbitrary ways, such as changing or disabling dependencies of a package. For instance, the Emacs package in Nixpkgs by default has a dependency on GTK 2. If you want to build it against GTK 3, you can specify that as follows: </para> <programlisting language="bash"> environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; </programlisting> <para> The function <literal>override</literal> performs the call to the Nix function that produces Emacs, with the original arguments amended by the set of arguments specified by you. So here the function argument <literal>gtk</literal> gets the value <literal>pkgs.gtk3</literal>, causing Emacs to depend on GTK 3. (The parentheses are necessary because in Nix, function application binds more weakly than list construction, so without them, <xref linkend="opt-environment.systemPackages" /> would be a list with two elements.) </para> <para> Even greater customisation is possible using the function <literal>overrideAttrs</literal>. While the <literal>override</literal> mechanism above overrides the arguments of a package function, <literal>overrideAttrs</literal> allows changing the <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>. This permits changing any aspect of the package, such as the source code. For instance, if you want to override the source code of Emacs, you can say: </para> <programlisting language="bash"> environment.systemPackages = [ (pkgs.emacs.overrideAttrs (oldAttrs: { name = "emacs-25.0-pre"; src = /path/to/my/emacs/tree; })) ]; </programlisting> <para> Here, <literal>overrideAttrs</literal> takes the Nix derivation specified by <literal>pkgs.emacs</literal> and produces a new derivation in which the original’s <literal>name</literal> and <literal>src</literal> attribute have been replaced by the given values by re-calling <literal>stdenv.mkDerivation</literal>. The original attributes are accessible via the function argument, which is conventionally named <literal>oldAttrs</literal>. </para> <para> The overrides shown above are not global. They do not affect the original package; other packages in Nixpkgs continue to depend on the original rather than the customised package. This means that if another package in your system depends on the original package, you end up with two instances of the package. If you want to have everything depend on your customised instance, you can apply a <emphasis>global</emphasis> override as follows: </para> <programlisting language="bash"> nixpkgs.config.packageOverrides = pkgs: { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; }; </programlisting> <para> The effect of this definition is essentially equivalent to modifying the <literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in Nixpkgs that depends on <literal>emacs</literal> will be passed your customised instance. (However, the value <literal>pkgs.emacs</literal> in <literal>nixpkgs.config.packageOverrides</literal> refers to the original rather than overridden instance, to prevent an infinite recursion.) </para> </section> </ins>


sys.stderr.write(msg.format(user)) return <del> basedir = os.path.join(TASKD_DATA_DIR, "keys", org, user) if os.path.exists(basedir): </del> <ins> keysdir = os.path.join(TASKD_DATA_DIR, "keys" ) orgdir  = os.path.join(keysdir       , org    ) userdir = os.path.join(orgdir        , user   ) if os.path.exists(userdir): </ins> raise OSError("Keyfile directory for {} already exists.".format(user)) <del> privkey = os.path.join(basedir, "private.key") pubcert = os.path.join(basedir, "public.cert") </del> <ins> privkey = os.path.join(userdir, "private.key") pubcert = os.path.join(userdir, "public.cert") </ins> try: <del> os.makedirs(basedir, mode=0o700) </del> <ins> # We change the permissions and the owner ship of the base directories # so that cfg.group and cfg.user could read the directories' contents. # See also: https://bugs.python.org/issue42367 for bd in [keysdir, orgdir, userdir]: # Allow cfg.group, but not others to read the contents of this group os.makedirs(bd, exist_ok=True) # not using mode= argument to makedirs intentionally - forcing the # permissions we want os.chmod(bd, mode=0o750) os.chown( bd, uid=pwd.getpwnam(TASKD_USER).pw_uid, gid=grp.getgrnam(TASKD_GROUP).gr_gid, ) </ins> certtool_cmd("-p", "--bits", CERT_BITS, "--outfile", privkey) <ins> os.chmod(privkey, 0o640) </ins> template_data = [ "organization = {0}".format(org),


makeFlags = [ "BUILD=RELEASE" <del> "VERSION=${version}" </del> <ins> "VERSION=${version}-${src.rev}" </ins> "BINDIR=${placeholder "out"}/bin" "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" "MODLDIR=${placeholder "out"}/lib/modules-load.d"


''; homepage = "https://www.electroncash.org/"; platforms = platforms.linux; <del> maintainers = with maintainers; [ lassulus nyanloutre ]; </del> <ins> maintainers = with maintainers; [ lassulus nyanloutre oxalica ]; </ins> license = licenses.mit; }; }


# https://github.com/NixOS/nixpkgs/issues/123851 ./fix-audio-driver-loading.patch # NOTE: both patches below should be removed when updating to 6.1.35 <del> # https://www.virtualbox.org/ticket/20914#comment:6 ./linux518.patch </del> <ins> # https://www.virtualbox.org/ticket/20914#comment:15 (fetchpatch { url = "https://www.virtualbox.org/raw-attachment/ticket/20914/vbox-linux-5.19.patch"; hash = "sha512-NNiMf8kUuM/PimrQCOacYLkrf7UFPh6ZdPsXKyLlsqWfWQXkG92Fv3qZXvg8weE1Z/SBsFTuHICEI4b4l1wZFw=="; extraPrefix = "/"; }) </ins> # https://www.virtualbox.org/ticket/20904#comment:22 ./ffreestanding.patch ];