<del> { lib, stdenv, fetchFromGitHub, cmake, libminc }: stdenv.mkDerivation rec { pname = "EBTKS"; version  = "unstable-2017-09-23"; src = fetchFromGitHub { owner  = "BIC-MNI"; repo   = pname; rev    = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; }; # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? postPatch = '' substituteInPlace templates/EBTKS/SimpleArray.h  --replace "#define FINITE(x) finite(x)" "#define FINITE(x) isfinite(x)" ''; nativeBuildInputs = [ cmake ]; buildInputs = [ libminc ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; meta = with lib; { homepage = "https://github.com/BIC-MNI/${pname}"; description = "Library for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license   = licenses.free; }; } </del>


--replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then' ''; <del> ELECTRON_SKIP_BINARY_DOWNLOAD=1; </del> <ins> ELECTRON_SKIP_BINARY_DOWNLOAD = 1; # remove giflib dependency npmRebuildFlags = [ "--ignore-scripts" ]; preBuild = '' substituteInPlace node_modules/canvas/binding.gyp  --replace-fail "'with_gif%': '<!(node ./util/has_lib.js gif)'" "'with_gif%': 'false'" npm rebuild ''; </ins> dontNpmBuild = true; postBuild = ''


wrap ${prefix}ld.bfd ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd fi <del> export real_cc=${prefix}cc export real_cxx=${prefix}c++ </del> <ins> # We export environment variables pointing to the wrapped nonstandard # cmds, lest some lousy configure script use those to guess compiler # version. export named_cc=${prefix}cc export named_cxx=${prefix}c++ </ins> export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" if [ -e $ccPath/${prefix}gcc ]; then wrap ${prefix}gcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcc ln -s ${prefix}gcc $out/bin/${prefix}cc <del> export real_cc=${prefix}gcc export real_cxx=${prefix}g++ </del> <ins> export named_cc=${prefix}gcc export named_cxx=${prefix}g++ </ins> elif [ -e $ccPath/clang ]; then wrap ${prefix}clang ${preWrap ./cc-wrapper.sh} $ccPath/clang ln -s ${prefix}clang $out/bin/${prefix}cc <del> export real_cc=clang export real_cxx=clang++ </del> <ins> export named_cc=${prefix}clang export named_cxx=${prefix}clang++ </ins> fi if [ -e $ccPath/${prefix}g++ ]; then


<del> { poetry2nix, pkgs, lib }: </del> <ins> { lib , python3 , fetchFromGitHub }: </ins> <del> let pythonPackages = (poetry2nix.mkPoetryPackages { projectDir = ./.; overrides = [ poetry2nix.defaultPoetryOverrides (import ./poetry-git-overlay.nix { inherit pkgs; }) (self: super: { </del> <ins> python3.pkgs.buildPythonApplication rec { pname = "rmfuse"; version = "unstable-2021-06-06"; </ins> <del> rmfuse = super.rmfuse.overridePythonAttrs(old: { meta = old.meta // { description = "RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem."; longDescription = '' RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem. These files are exposed either in their original format, or as PDF files that contain your annotations. This lets you manage files in the reMarkable Cloud using the same tools you use on your local system. ''; license = lib.licenses.mit; homepage = "https://github.com/rschroll/rmfuse"; maintainers = [ lib.maintainers.adisbladis ]; }; }); </del> <ins> format = "pyproject"; </ins> <del> reportlab = let ft = pkgs.freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in super.reportlab.overridePythonAttrs(old: { postPatch = '' substituteInPlace setup.py  --replace "mif = findFile(d,'ft2build.h')" "mif = findFile('${lib.getDev ft}','ft2build.h')" ''; </del> <ins> src = fetchFromGitHub { owner = "rschroll"; repo = "rmfuse"; rev = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2"; hash = "sha256-W3kS6Kkmp8iWMOYFL7r1GyjSQvFotBXQCuTMK0vyHQ8="; }; </ins> <del> NIX_CFLAGS_COMPILE = "-I${pkgs.freetype}/include/freetype2"; </del> <ins> postPatch = '' substituteInPlace pyproject.toml  --replace 'bidict = "^' 'bidict = ">=' ''; </ins> <del> nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; buildInputs = old.buildInputs ++ [ pkgs.freetype ]; }); </del> <ins> nativeBuildInputs = with python3.pkgs; [ poetry-core ]; </ins> <del> }) ]; }).python.pkgs; in pythonPackages.rmfuse </del> <ins> propagatedBuildInputs = with python3.pkgs; [ bidict rmrl rmcl pyfuse3 xdg ]; meta = { description = "FUSE access to the reMarkable Cloud"; homepage = "https://github.com/rschroll/rmfuse"; license = lib.licenses.mit; longDescription = '' RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem. These files are exposed either in their original format, or as PDF files that contain your annotations. This lets you manage files in the reMarkable Cloud using the same tools you use on your local system. ''; maintainers = with lib.maintainers; [ adisbladis ]; }; } </ins>


./patchinstall.sh DESTDIR="$PWD/.." --all cd .. ''; <del> }) </del> <ins> })) // { meta = wineUnstable.meta // { description = wineUnstable.meta.description + " (with staging patches)"; }; } </ins>


, xkeyboard_config , udisks2 <ins> , waylandSupport ? false, wayland-protocols, xwayland </ins> , bluetoothSupport ? true, bluez5 , pulseSupport ? !stdenv.isDarwin, libpulseaudio }:


<ins> { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "gradle-completion-${version}"; version = "1.3.1"; src = fetchFromGitHub { owner = "gradle"; repo = "gradle-completion"; rev = "v${version}"; sha256 = "02vv360r78ckwc6r4xbhmy5dxz6l9ya4lq9c62zh12ciq94y9kgx"; }; # we just move two files into $out, # this shouldn't bother Hydra. preferLocalBuild = true; dontBuild = true; installPhase = '' runHook preInstall mkdir -p $out install -Dm0644 ./_gradle $out/share/zsh/site-functions/_gradle install -Dm0644 ./gradle-completion.bash $out/share/bash-completion/completions/gradle runHook postInstall ''; meta = with stdenv.lib; { description = "Gradle tab completion for bash and zsh"; homepage = https://github.com/gradle/gradle-completion; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; } </ins>


githubId = 84968; name = "Florian Paul Schmidt"; }; <ins> fptje = { email = "fpeijnenburg@gmail.com"; github = "FPtje"; githubId = 1202014; name = "Falco Peijnenburg"; }; </ins> fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus";


{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib <del> , future, psutil, setuptools </del> <ins> , defusedxml, future, psutil, setuptools </ins> # Optional dependencies: , bottle, pysnmp , hddtemp


freeformType = settingsFormat.type; options = { source_directories = mkOption { <del> type = nullOr (listOf str); default = null; </del> <ins> type = listOf str; default = []; </ins> description = '' List of source directories and files to backup. Globs and tildes are expanded. Do not backslash spaces in path names.


callHackageDirect = {pkg, ver, sha256}@args: let pkgver = "${pkg}-${ver}"; in self.callCabal2nix pkg (pkgs.fetchzip { <del> url = "http://hackage.haskell.org/package/${pkgver}/${pkgver}.tar.gz"; </del> <ins> url = "mirror://hackage/${pkgver}/${pkgver}.tar.gz"; </ins> inherit sha256; });


ln -s --force "$emulator" /run/${dirName}/nix-emulators/ done <del> for helper in libexec/qemu-bridge-helper bin/qemu-pr-helper; do </del> <ins> for helper in bin/qemu-pr-helper; do </ins> ln -s --force ${cfg.qemu.package}/$helper /run/${dirName}/nix-helpers/ done


<del> { pkgs }: self: super: { rmfuse = super.rmfuse.overridePythonAttrs ( _: { src = pkgs.fetchgit { url = "https://github.com/rschroll/rmfuse.git"; rev = "3796b8610c8a965a60a417fc0bf8ea5200b71fd2"; sha256 = "03qxy95jpk741b81bd38y51d4a0vynx2y1g662bci9r6m7l14yav"; }; } ); } </del>


pname = commonDerivationAttrs.pname + "-frontend"; nativeBuildInputs = [ <del> wasm-pack wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld </del> <ins> wasm-pack wasm-bindgen-84 binaryen which rustc-wasm rustc-wasm.llvmPackages.lld </ins> ]; buildPhase = ''


postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn  --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' <ins> '' + lib.optionalString stdenv.isDarwin '' substituteInPlace build/config/compiler/compiler.gni  --replace 'strip_absolute_paths_from_debug_symbols = true'  'strip_absolute_paths_from_debug_symbols = false' substituteInPlace build/config/compiler/BUILD.gn  --replace 'current_toolchain == host_toolchain || !use_xcode_clang'  'false' </ins> ''; gnFlags = [


echo "Checking tor-browser wrapper ..." TBB_HOME=$(mktemp -d)  $out/bin/tor-browser --version >/dev/null <ins> runHook postBuild ''; installPhase = '' runHook preInstall # Install distribution customizations install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json runHook postInstall </ins> ''; meta = with lib; {


buildInputs = [ libusb1 ]; <del> cmakeFlags = lib.optional stdenv.isLinux "-DINSTALL_UDEV_RULES=ON"; </del> <ins> cmakeFlags = lib.optional stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" "-DWITH_RPC=ON" ]; </ins> meta = with lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";


tests.mesos = callTest tests/mesos.nix {}; tests.misc = callTest tests/misc.nix {}; tests.mongodb = callTest tests/mongodb.nix {}; <ins> tests.mpd = callTest tests/mpd.nix {}; </ins> tests.mumble = callTest tests/mumble.nix {}; tests.munin = callTest tests/munin.nix {}; tests.mutableUsers = callTest tests/mutable-users.nix {};


in python3.pkgs.buildPythonApplication rec { pname = "textext"; <del> version = "1.8.1"; </del> <ins> version = "1.10.1"; </ins> src = fetchFromGitHub { owner = "textext"; repo = "textext"; rev = version; <del> sha256 = "sha256-Qzd39X0X3DdwZ3pIIGvEbNjl6dxjDf3idzjwCkp3WRg="; </del> <ins> sha256 = "sha256-FbUfZfVOYEyQVL1YMyNwb/sIUxJ+VhevatjuJI/ocIw="; </ins> }; patches = [


stdenv.mkDerivation rec { pname = "nemo"; <del> version = "5.4.2"; </del> <ins> version = "5.4.3"; </ins> # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327)


fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; <del> firebird = callPackage ../servers/firebird { icu = null; /*stdenv = gcc5Stdenv;*/ }; firebirdSuper = firebird.override { icu = icu58; superServer = true; /*stdenv = gcc5Stdenv;*/ }; </del> <ins> inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5; firebird = firebird_3; </ins> freeradius = callPackage ../servers/freeradius { };


upstreamDoc = "See [the upstream documentation](https://github.com/jtroo/kanata/blob/main/docs/config.adoc) and [example config files](https://github.com/jtroo/kanata/tree/main/cfg_samples) for more information."; <del> keyboard = { </del> <ins> keyboard = { name, config, ... }: { </ins> options = { devices = mkOption { type = types.listOf types.str;


doCheck = true; <del> meta = with stdenv.lib; { </del> <ins> meta = with lib; { </ins> homepage = src.meta.homepage; description = "ACME client that can obtain certs and extensibly update server configurations"; platforms = platforms.unix; <del> maintainers = [ maintainers.domenkozar ]; license = licenses.asl20; </del> <ins> maintainers = with maintainers; [ domenkozar ]; license = with licenses; [ asl20 ]; </ins> }; }


ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} # Include a sitecustomize.py file <del> cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py </del> <ins> cp ${../sitecustomize.py} $out/${if isPy38OrNewer then sitePackages else "lib/${libPrefix}/${sitePackages}"}/sitecustomize.py </ins> runHook postInstall '';


<del> { stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }: </del> <ins> { stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen , xkeyboard_config, libxcb, libxml2 , python3 , libX11 }: </ins> stdenv.mkDerivation rec { pname = "libxkbcommon"; <del> version = "0.10.0"; </del> <ins> version = "1.0.3"; </ins> src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; <del> sha256 = "1wmnl0hngn6vrqrya4r8hvimlkr4jag39yjprls4gyrqvh667hsp"; </del> <ins> sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852"; </ins> }; outputs = [ "out" "dev" "doc" ]; <del> nativeBuildInputs = [ meson ninja pkgconfig yacc doxygen ]; buildInputs = [ xkeyboard_config libxcb ]; </del> <ins> nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ]; buildInputs = [ xkeyboard_config libxcb libxml2 ]; checkInputs = [ python3 ]; </ins> mesonFlags = [ <del> "-Denable-wayland=false" </del> "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" <ins> "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc) </ins> "-Dx-locale-root=${libX11.out}/share/X11/locale" <ins> "-Denable-wayland=false" "-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output) </ins> ]; <del> doCheck = false; # fails, needs unicode locale </del> <ins> doCheck = true; preCheck = '' patchShebangs ../test/ ''; </ins> meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; <ins> longDescription = '' libxkbcommon is a keyboard keymap compiler and support library which processes a reduced subset of keymaps as defined by the XKB (X Keyboard Extension) specification. It also contains a module for handling Compose and dead keys. ''; # and a separate library for listing available keyboard layouts. </ins> homepage = "https://xkbcommon.org"; <ins> changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS"; </ins> license = licenses.mit; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; unix;


{ self, callPackage }: callPackage ./default.nix { inherit self; <del> version = "2.1.0-2021-05-29"; rev = "839fb5bd72341d8e67b6cfc2053e2acffdb75567"; </del> <ins> version = "2.1.0-2021-06-25"; rev = "e957737650e060d5bf1c2909b741cc3dffe073ac"; </ins> isStable = false; <del> sha256 = "1gyzq4n0fwah0245wazv4c43q9in1mwbk3dhh6cb1ijnjcxp2bb6"; </del> <ins> sha256 = "04i7n5xdd1nci4mv2p6bv71fq5b1nkswz12hcgirsxqbnkrlbbcj"; </ins> }


stdenv.mkDerivation rec { pname = "snappy"; <del> version = "1.1.8"; </del> <ins> version = "1.1.9"; </ins> src = fetchFromGitHub { owner = "google"; repo = "snappy"; rev = version; <del> sha256 = "1j0kslq2dvxgkcxl1gakhvsa731yrcvcaipcp5k8k7ayicvkv9jv"; </del> <ins> sha256 = "sha256-JXWl63KVP+CDNWIXYtz+EKqWLJbPKl3ifhr8dKAp/w8="; </ins> }; <del> patches = [ ./disable-benchmark.patch ]; </del> outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ];


pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { }; <ins> pinentry-rofi = callPackage ../tools/security/pinentry-rofi { }; </ins> pingtcp = callPackage ../tools/networking/pingtcp { }; pinnwand = callPackage ../servers/pinnwand { };


pytest-httpx pytest-mock pytest-rerunfailures <del> pytest-xdist </del> pytestCheckHook ];


"treat_warnings_as_errors=false" "v8_enable_i18n_support=true" "use_gold=false" <del> "use_system_xcode=true" </del> <ins> "init_stack_vars=false" </ins> # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; NIX_CFLAGS_COMPILE = "-O2"; <del> nativeBuildInputs = [ gn ninja pkg-config python ] ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; </del> <ins> FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; nativeBuildInputs = [ gn ninja pkg-config python ] ++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools pythonPackages.setuptools ]; </ins> buildInputs = [ glib icu ]; ninjaFlags = [ ":d8" "v8_monolith" ];


<del> { fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg }: </del> <ins> { fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd }: </ins> let pname = "anki-bin"; # Update hashes for both Linux and Darwin! <del> version = "2.1.49"; </del> <ins> version = "2.1.51"; </ins> sources = { linux = fetchurl { <del> url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; sha256 = "sha256-uG39g9CXnquArFsxtFHWWoDaNwu8y2KKh+SqGt8aqi0="; </del> <ins> url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; sha256 = "sha256-ZKVc+TvkNu5mGgibhRIuoLuIfvyoVDy+c4h+Apz9P+0="; </ins> }; <del> darwin = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; sha256 = "sha256-sEVWZQpICL7RYrOuPm1Y5XhzPxCwNk1WGP1rctTtE4Y="; </del> <ins> # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; sha256 = "sha256-wZMJEbcpezVAuBSKlwNTHlqjp0FfmyDB7XD6BBuJhyA="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; sha256 = "sha256-6RDTYKoisX5DJ9VPWrP9VH9DCABabb9MB3nG4S8jtR0="; </ins> }; }; unpacked = stdenv.mkDerivation { inherit pname version; <ins> nativeBuildInputs = [ zstd ]; </ins> src = sources.linux; installPhase = ''


<del> { stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, utillinux }: </del> <ins> { stdenv, lib, fetchurl, utillinux, makeWrapper , enableReadline ? true, readline, ncurses }: </ins> <del> with stdenv.lib; let makeFlags = '' INCDIR=${glibc.dev}/include  BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1  USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses'  TERMCONTROL=-DUSE_TERMIOS  ''; in </del> stdenv.mkDerivation rec { name = "calc-${version}"; version = "2.12.6.6"; src = fetchurl { <del> url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"; </del> <ins> urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2" ]; </ins> sha256 = "03sg1xhin6qsrz82scf96mmzw8lz1yj68rhj4p4npp4s0fawc9d5"; }; <del> buildInputs = [ makeWrapper readline ncurses utillinux ]; configurePhase = '' sed -i 's/all: check_include/all:/' Makefile ''; buildPhase = '' make ${makeFlags} ''; installPhase = '' make install ${makeFlags} wrapProgram $out/bin/calc --prefix LD_LIBRARY_PATH : $out/lib </del> <ins> patchPhase = '' substituteInPlace Makefile  --replace 'all: check_include' 'all:'  --replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}'  --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' </ins> ''; <del> # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; meta = { </del> <ins> buildInputs = [ utillinux makeWrapper ] ++ lib.optionals enableReadline [ readline ncurses ]; makeFlags = [ "T=$(out)" "INCDIR=${lib.getDev stdenv.cc.libc}/include" "BINDIR=/bin" "LIBDIR=/lib" "CALC_SHAREDIR=/share/calc" "CALC_INCDIR=/include" "MANDIR=/share/man/man1" # Handle LDFLAGS defaults in calc "DEFAULT_LIB_INSTALL_PATH=$(out)/lib" ] ++ lib.optionals enableReadline [ "READLINE_LIB=-lreadline" "USE_READLINE=-DUSE_READLINE" ]; meta = with lib; { </ins> description = "C-style arbitrary precision calculator"; homepage = http://www.isthe.com/chongo/tech/comp/calc/; license = licenses.lgpl21; <del> maintainers = [ ]; </del> <ins> maintainers = with maintainers; [ matthewbauer ]; </ins> platforms = platforms.all; }; }


sundials = callPackage ../development/libraries/sundials { }; <ins> sundials_2 = callPackage ../development/libraries/sundials/2.x.nix { python = python3; }; </ins> sutils = callPackage ../tools/misc/sutils { }; svrcore = callPackage ../development/libraries/svrcore { };


proxy_pass_request_body           off; ''; }; "@redirectToAuth2ProxyLogin" = { return = "307 https://${cfg.domain}/oauth2/start?rd=$scheme://$host$request_uri"; extraConfig = ''


<del> { lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, openssl </del> <ins> { lib, stdenv, fetchFromGitLab, fetchpatch, rustPlatform, pkg-config, openssl </ins> , installShellFiles , Security, AppKit


tinyscheme = callPackage ../development/interpreters/tinyscheme { }; <ins> tbox = callPackage ../development/libraries/tbox { }; </ins> inherit (nodePackages) typescript; bupc = callPackage ../development/compilers/bupc { };


}; postPatch = '' <del> patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so </del> <ins> addAutoPatchelfSearchPath ${jre8}/lib/openjdk/jre/lib/ autoPatchelf lib # Nix cannot see the runtime references to the paths we just patched in # once they've been compressed into the .jar. Scan for and remember them # as plain text so they don't get overlooked. find . -name '*.so' | xargs strings | { grep '/nix/store' || :; } >> ./.jar-paths </ins> ''; <del> nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ]; </del> <ins> nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas libXxf86vm ]; </ins> buildPhase = '' runHook preBuild


for line in f: result = line result = re.sub( <del> fr'^    version = ".+"; #{variant}', f'    version = "{version}"; #{variant}', </del> <ins> fr'^      version = ".+"; #{variant}', f'      version = "{version}"; #{variant}', </ins> result) result = re.sub( <del> fr'^    suffix = ".+"; #{variant}', f'    suffix = "{suffix}"; #{variant}', </del> <ins> fr'^      suffix = ".+"; #{variant}', f'      suffix = "{suffix}"; #{variant}', </ins> result) result = re.sub( <del> fr'^    sha256 = ".+"; #{variant}', f'    sha256 = "{sha256}"; #{variant}', </del> <ins> fr'^      sha256 = ".+"; #{variant}', f'      sha256 = "{sha256}"; #{variant}', </ins> result) print(result, end='')


libsecret ]; <del> preBuild = '' </del> <ins> # FIXME add back once upstream moves to Electron >= 26 # we use electron_26 because electron_25 is EOL /*preBuild = '' </ins> if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then echo 'ERROR: electron version mismatch' exit 1 fi <del> ''; </del> <ins> '';*/ </ins> postBuild = '' pushd apps/desktop


<ins> diff --git a/networkd-dispatcher b/networkd-dispatcher index ef877ce..8c341f2 100755 --- a/networkd-dispatcher +++ b/networkd-dispatcher @@ -171,6 +171,8 @@ def check_perms(path, mode=0o755, uid=0, gid=0): if not os.path.exists(path): raise FileNotFoundError +    if re.search('^/nix/store/.*', str(path)): +        return True st = os.stat(path, follow_symlinks=False) st_mode = st.st_mode & 0x00FFF if st.st_uid == uid and st.st_gid == gid and st_mode == mode: </ins>


let <del> requiredPackages = map lib.lowPrio </del> <ins> requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg) </ins> [ config.nix.package pkgs.acl pkgs.attr


# Rename the binary mv "$out/bin/Pinta" "$out/bin/pinta" <ins> # Copy runtime icons mkdir -p $out/share/icons/hicolor/16x16/ cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/ </ins> # Install dotnet build installer/linux/install.proj  -target:Install


<ins> { lib , mkDerivation , fetchurl , extra-cmake-modules , kirigami2 , ktextwidgets , libksane , qtquickcontrols2 }: mkDerivation rec { pname = "skanpage"; version = "1.0.0"; src = fetchurl { url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz"; hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA="; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kirigami2 ktextwidgets libksane qtquickcontrols2 ]; meta = with lib; { description = "KDE utility to scan images and multi-page documents"; homepage = "https://apps.kde.org/skanpage"; license = licenses.gpl2Plus; maintainers = with maintainers; [ samuelgrf ]; platforms = platforms.linux; }; } </ins>


<ins> diff --git a/pdf-create-empty b/pdf-create-empty index e4768af..5caf34c 100755 --- a/pdf-create-empty +++ b/pdf-create-empty @@ -20,7 +20,7 @@ def main(args): except: die('Invalid dimensions') subprocess.run([ -        'gs', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET', +        '@gs@', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET', f'-sOutputFile={o}', '-sDEVICE=pdfwrite', f'-dDEVICEWIDTHPOINTS={w}', f'-dDEVICEHEIGHTPOINTS={h}', diff --git a/pdf-sign b/pdf-sign index 64be231..37d508d 100755 --- a/pdf-sign +++ b/pdf-sign @@ -17,7 +17,7 @@ def main(args): if args.flatten: outFile=intmp('input.pdf') subprocess.run([ -                    'pdftk', filePath, +                    '@pdftk@', filePath, 'output', outFile, 'flatten' ], check=True) @@ -28,7 +28,7 @@ def main(args): if args.page < -pageCount or args.page==0 or pageCount < args.page: die('Page number out of range') pageNumber=Cell(args.page if 0 < args.page else pageCount+args.page+1) -        pagePDF=Cell(lambda: subprocess.run(['pdftk', inputPDF(), 'cat', str(pageNumber()), 'output', intmp('page.pdf')], check=True) and intmp('page.pdf')) +        pagePDF=Cell(lambda: subprocess.run(['@pdftk@', inputPDF(), 'cat', str(pageNumber()), 'output', intmp('page.pdf')], check=True) and intmp('page.pdf')) pageSize=Cell(lambda: pdfGetSize(pagePDF())) # The chosen signature if not args.signature and args.batch: @@ -52,7 +52,7 @@ def main(args): dy=h*(1-signaturePositionY())/resize - sh/2 outFile=intmp('signature-positioned.pdf') subprocess.run([ -                'gs', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET', +                '@gs@', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET', f'-sOutputFile={outFile}', '-sDEVICE=pdfwrite', f'-dDEVICEWIDTHPOINTS={w}', f'-dDEVICEHEIGHTPOINTS={h}', '-dFIXEDMEDIA', @@ -62,7 +62,7 @@ def main(args): return outFile # The signed page signedPagePDF=Cell(lambda: subprocess.run([ -            'pdftk', +            '@pdftk@', pagePDF(), 'stamp', signaturePositionedPDF(), 'output', intmp('signed-page.pdf'), @@ -80,7 +80,7 @@ def main(args): (w, h)=displaySize() outFile=intmp('display.png') subprocess.run([ -                'gs', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET', +                '@gs@', '-dBATCH', '-dNOPAUSE', '-dSAFER', '-dQUIET', f'-sOutputFile={outFile}', '-sDEVICE=pngalpha', '-dMaxBitmap=2147483647', @@ -258,7 +258,7 @@ def main(args): if args.existing=='backup': backupFilePath=f'{signedFilePath}.backup{time.strftime("%Y%m%d_%H%M%S")}' subprocess.run([ -                        'mv', +                        '@mv@', signedFilePath, backupFilePath, ], check=True) @@ -269,7 +269,7 @@ def main(args): assert args.existing=='overwrite' pnr=pageNumber() subprocess.run([ -                'pdftk', +                '@pdftk@', f'A={inputPDF()}', f'B={signedPagePDF()}', 'cat', @@ -352,10 +352,10 @@ def tkthrottle(frequency, root): return decorator def pdfCountPages(filePath): -    return int(fromCmdOutput(["pdfinfo", filePath], "^.*nPages: +([0-9]+)n.*$")[1]) +    return int(fromCmdOutput(["@pdfinfo@", filePath], "^.*nPages: +([0-9]+)n.*$")[1]) def pdfGetSize(filePath): -    [ignored, w, h, *ignored2]=fromCmdOutput(['pdfinfo', filePath], '^.*nPage size: +([0-9.]+) x ([0-9.]+) pts( ([A-Za-z0-9]+))?n.*$') +    [ignored, w, h, *ignored2]=fromCmdOutput(['@pdfinfo@', filePath], '^.*nPage size: +([0-9.]+) x ([0-9.]+) pts( ([A-Za-z0-9]+))?n.*$') return (float(w), float(h)) def m(pattern, string): </ins>


# To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch <ins> # Support disabling process timeouts when set to 0 # See https://github.com/microsoft/debugpy/pull/1286 (fetchpatch { url = "https://github.com/microsoft/debugpy/commit/1569cc8319350afcc5ba8630660f599d514ac3bb.patch"; hash = "sha256-v4GKLb2M20F1egAGtix9cTkSzBnvSgSSphSQST5p63w="; }) </ins> ] ++ lib.optionals stdenv.isLinux [ # Hard code GDB path (used to attach to process) (substituteAll {


r2mod_cli = callPackage ../games/r2mod_cli { }; <ins> r2modman = callPackage ../games/r2modman { }; </ins> racer = callPackage ../games/racer { }; randtype = callPackage ../games/randtype { };


hashType=$NIX_HASH_ALGO hashFormat=$hashFormat format=nix <del> skopeoCmd="skopeo --insecure-policy --tmpdir=$TMPDIR" </del> usage(){ echo  >&2 "syntax: nix-prefetch-docker [options] [IMAGE_NAME [IMAGE_TAG|IMAGE_DIGEST]]


netfilterRPFilter = true; grsecurity = false; xen_dom0 = false; <ins> ia32Emulation = true; </ins> } // features) kernelPatches; intermediateNixConfig = import ./common-config.nix {


makeShellWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { <del> shell = targetPackages.runtimeShell; </del> <ins> # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not  __raw) shell = if targetPackages ? runtimeShell then targetPackages.runtimeShell else throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs"; </ins> }; passthru = { tests = tests.makeWrapper;


{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull <del> , libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk </del> <ins> , libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk </ins> , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null


<del> diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts index 9522499..9911530 100644 --- a/src/color_dialog/src/main.ts +++ b/src/color_dialog/src/main.ts @@ -1,4 +1,4 @@ -#!/usr/bin/gjs +#!/usr/bin/env gjs imports.gi.versions.Gtk = '3.0'; @@ -84,4 +84,4 @@ function launch_color_dialog() { Gtk.init(null); -launch_color_dialog()  No newline at end of file +launch_color_dialog() </del> diff --git a/src/extension.ts b/src/extension.ts index 7417c46..00d5829 100644 --- a/src/extension.ts


owner = "bpozdena"; repo = "OneDriveGUI"; rev = "v${version}"; <del> hash = "sha256-HutziAzhIDYP8upNPieL2GNrxPBHUCVs09FFxdSqeBs="; </del> <ins> hash = "sha256-d5NAcT3x9R/2DVQKZsw4GH63nTlVFsvkWwMrb42s18s="; </ins> }; <del> nativeBuildInputs = [ copyDesktopItems makeWrapper ]; </del> <ins> nativeBuildInputs = [ copyDesktopItems makeWrapper ]; </ins> <del> propagatedBuildInputs = with python3Packages; [ pyside6 requests ]; </del> <ins> propagatedBuildInputs = with python3Packages; [ pyside6 requests ]; </ins> # wrap manually to avoid having a bash script in $out/bin with a .py extension dontWrapPythonPrograms = true;


<ins> diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go --- terraform.old/internal/command/init.go +++ terraform.new/internal/command/init.go @@ -3,6 +3,7 @@ import ( "context" "fmt" +	"os" "log" "strings" @@ -55,6 +56,11 @@ var diags tfdiags.Diagnostics +	val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") +	if ok { +		flagPluginPath = append(flagPluginPath, val) +	} + if len(flagPluginPath) > 0 { c.pluginPath = flagPluginPath } </ins>


python3.pkgs.buildPythonApplication rec { pname = "radicale"; <del> version = "3.1.3"; </del> <ins> version = "3.1.4"; </ins> src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; <del> hash = "sha256-a1oapCktJPvNO+MTsB9COtxSFB/ZIZvJiuqX+s+lncY="; </del> <ins> hash = "sha256-vX6lYiDqpQeWVLotyt2ODwcjskWB6EuCky3/V8m1m7Q="; </ins> }; postPatch = ''


<ins> # pkgs.ociTools {#sec-pkgs-ociTools} `pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that it makes no assumptions about the container runner you choose to use to run the created container. ## buildContainer {#ssec-pkgs-ociTools-buildContainer} This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory.The nix store of the container will contain all referenced dependencies of the given command. The parameters of `buildContainer` with an example value are described below: ```nix buildContainer { args = [ (with pkgs; writeScript "run.sh" '' #!${bash}/bin/bash exec ${bash}/bin/bash '').outPath ]; mounts = { "/data" = { type = "none"; source = "/var/lib/mydata"; options = [ "bind" ]; }; }; readonly = false; } ``` - `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container - `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs) - `readonly` makes the container's rootfs read-only if it is set to true. The default value is false `false`. </ins>


owner = "WerWolv"; repo = pname; rev = "v${version}"; <del> hash = "sha256-H2bnRByCUAltngmVWgPW4vW8k5AWecOAzwtBKsjbpTw="; </del> <ins> hash = "sha256-meOx8SkufXbXuBIVefr/mO9fsUi3zeQmqmf86+aDMaI="; </ins> }; nativeBuildInputs = [ cmake llvm python3 perl pkg-config ];


<ins> { lib , python3 , fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "rstfmt"; version = "0.0.13"; format = "pyproject"; src = fetchFromGitHub { owner = "dzhu"; repo = "rstfmt"; rev = "refs/tags/v${version}"; hash = "sha256-SJRA14CfoT8XMt3hMB7cLdmuLwsJnBSwhKkD1pJvQCI="; }; propagatedBuildInputs = with python3.pkgs; [ black docutils sphinx ]; # Project has no unittest just sample files doCheck = false; pythonImportsCheck = [ "rstfmt" ]; meta = with lib; { description = "A formatter for reStructuredText"; homepage = "https://github.com/dzhu/rstfmt"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } </ins>


<ins> --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -266,18 +266,13 @@ ''' if option.endswith('dir') and os.path.isabs(value) and  option not in builtin_dir_noprefix_options: -            # Value must be a subdir of the prefix # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -            if commonpath([value, prefix]) != str(PurePath(prefix)): -                m = 'The value of the {!r} option is {!r} which must be a '  -                    'subdir of the prefix {!r}.nNote that if you pass a '  -                    'relative path, it is assumed to be a subdir of prefix.' -                raise MesonException(m.format(option, value, prefix)) -            # Convert path to be relative to prefix -            skip = len(prefix) + 1 -            value = value[skip:] +            if commonpath([value, prefix]) == str(PurePath(prefix)): +                # Convert path to be relative to prefix +                skip = len(prefix) + 1 +                value = value[skip:] return value def init_builtins(self, options): </ins>


<ins> From 74fb65a2574c93a2b20a51875a5e336f727ff4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> Date: Wed, 25 Dec 2019 18:48:38 -0300 Subject: [PATCH] Search system themes in system data dirs --- capplets/common/gtkrc-utils.c     | 20 ++++++++++++-------- capplets/common/mate-theme-info.c | 18 +++++++++++------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c index 011c8a1..27e01da 100644 --- a/capplets/common/gtkrc-utils.c +++ b/capplets/common/gtkrc-utils.c @@ -60,15 +60,19 @@ gchar* gtkrc_find_named(const gchar* name) if (!path) { -		gchar* theme_dir = gtk_rc_get_theme_dir(); -		path = g_build_filename(theme_dir, name, subpath, NULL); -		g_free(theme_dir); +		const gchar * const * dirs = g_get_system_data_dirs(); -		if (!g_file_test(path, G_FILE_TEST_EXISTS)) -		{ -			g_free (path); -			path = NULL; -		} +		if (dirs != NULL) +			for (; !path && *dirs != NULL; ++dirs) +			{ +				path = g_build_filename(*dirs, "themes", name, subpath, NULL); + +				if (!g_file_test(path, G_FILE_TEST_EXISTS)) +				{ +					g_free (path); +					path = NULL; +				} +			} } return path; diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c index 54ae3ae..a738f0b 100644 --- a/capplets/common/mate-theme-info.c +++ b/capplets/common/mate-theme-info.c @@ -1763,6 +1763,7 @@ mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2) void mate_theme_init () { +  const gchar * const * dirs; GFile *top_theme_dir; gchar *top_theme_dir_string; static gboolean initted = FALSE; @@ -1783,13 +1784,16 @@ mate_theme_init () theme_hash_by_uri = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); theme_hash_by_name = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); -  /* Add all the toplevel theme dirs. */ -  /* $datadir/themes */ -  top_theme_dir_string = gtk_rc_get_theme_dir (); -  top_theme_dir = g_file_new_for_path (top_theme_dir_string); -  g_free (top_theme_dir_string); -  add_top_theme_dir_monitor (top_theme_dir, 1, NULL); -  g_object_unref (top_theme_dir); +  /* Add all the toplevel theme dirs following the XDG Base Directory Specification */ +  dirs = g_get_system_data_dirs (); +  if (dirs != NULL) +    for (; *dirs != NULL; ++dirs) { +      top_theme_dir_string = g_build_filename (*dirs, "themes", NULL); +      top_theme_dir = g_file_new_for_path (top_theme_dir_string); +      g_free (top_theme_dir_string); +      add_top_theme_dir_monitor (top_theme_dir, 1, NULL); +      g_object_unref (top_theme_dir); +    } /* ~/.themes */ top_theme_dir_string  = g_build_filename (g_get_home_dir (), ".themes", NULL); -- 2.24.1 </ins>


<del> { pkgs, lib }: </del> <ins> { __splicedPackages, lib }: let pkgs = __splicedPackages; in </ins> rec { /* Similar to callPackageWith/callPackage, but without makeOverridable


}; in python.pkgs.buildPythonApplication rec { pname = "spotdl"; <del> version = "4.1.10"; </del> <ins> version = "4.1.11"; </ins> format = "pyproject";


sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; <del> hash = "sha256-aPFKKCqjKZSz/ZX5G3RiIkLHIj89MGPp+PgFbE4vpgE="; </del> <ins> hash = "sha256-xwKNDTlghNkq36wMAKSa+reROqGwMm4dZ/Hfos1zuP4="; </ins> }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; <del> hash = "sha256-u2UlimmIE2z7qsqkAbSfi7kxuOjlJGkX4RAsUGMklGc="; </del> <ins> hash = "sha256-gaquYp4q22IJHV7Fx5GxZWVFvJzU30HOmL32lkxJeQ8="; </ins> }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; <del> hash = "sha256-MO01plCsZRR+2kC2J0/VhXJIhchMfLtMFvidPNAXtB4="; </del> <ins> hash = "sha256-DPVnTzdGprjZ16kme3Y6xBognjWHt+0N/zk0J3dm8jY="; </ins> }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; <del> hash = "sha256-yw17x8DmKktE5fNBF3JQdVSEXFwAotA7hCzfLcd6JoI="; </del> <ins> hash = "sha256-Er7QiWBhENTa9xhCIVqECCzexWejBwBC59u3CJKQiwc="; </ins> }; }; updateScript = writeShellScript "update-bun" ''


rm ./texmf.cnf sed  -e 's,texmf-dist,texmf,g'  <del> -e 's,texmf-local,texmf,g'  </del> -e "s,$SELFAUTOLOC,$out,g"  -e "s,$SELFAUTODIR,$out/share,g"  -e "s,$SELFAUTOPARENT,$out/share,g"


'') plugins} ''; <ins> # Function that automatically links the default NDK plugin. linkNdkPlugin = {name, plugin, check}: lib.optionalString check '' ln -s ${plugin}/libexec/android-sdk/${name} ${name} ''; </ins> # Function that automatically links a plugin for which only one version exists linkPlugin = {name, plugin, check ? true}: lib.optionalString check ''


<del> { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: </del> <ins> { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }: </ins> stdenv.mkDerivation { pname = "universal-ctags";


buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; nativeBuildInputs = [ qmake qttools ]; <del> postPatch = lib.optionalString (ffmpeg != null) '' </del> <ins> patches = [ ./yt-dlp-path.patch ]; postPatch = '' substituteInPlace youtube_dl.cpp  --replace 'QString YoutubeDl::path = QString();'  'QString YoutubeDl::path = QString("${yt-dlp}/bin/yt-dlp");' '' + lib.optionalString (ffmpeg != null) '' </ins> substituteInPlace converter_ffmpeg.cpp  --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"'  --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '


<del> { stdenv, config, lib, fetchFromGitHub, cmake, libusb1, ninja, pkg-config, gcc </del> <ins> { stdenv , config , lib , fetchFromGitHub , fetchpatch , cmake , libusb1 , ninja , pkg-config , gcc </ins> , cudaSupport ? config.cudaSupport or false, cudatoolkit <del> , enablePython ? false, pythonPackages ? null }: </del> <ins> , enablePython ? false, pythonPackages ? null }: </ins> assert cudaSupport -> cudatoolkit != null; assert enablePython -> pythonPackages != null;


postInstall = '' mkdir -p $out/lib/password-store/extensions <del> cp ${src}/import.bash $out/lib/password-store/extensions/import.bash </del> <ins> cp import.bash $out/lib/password-store/extensions/import.bash </ins> wrapProgram $out/lib/password-store/extensions/import.bash  --prefix PATH : "${python3Packages.python.withPackages (_: propagatedBuildInputs)}/bin"  --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}"  --run "export PREFIX" <del> cp -r ${src}/share $out/ </del> <ins> cp -r share $out/ </ins> ''; postCheck = ''


BINARY = 64; TARGET = setTarget "ATHLON"; DYNAMIC_ARCH = setDynamicArch true; <ins> NO_AVX512 = !enableAVX512; </ins> USE_OPENMP = !stdenv.hostPlatform.isMusl; };


<ins> { addressable = { dependencies = ["public_suffix"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; version = "2.8.0"; }; bson = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03n3w96vpblaxvk1qk8hq7sbsmg4nv7qdkdr8f7nfvalgpakp5i5"; type = "gem"; }; version = "4.14.1"; }; ipaddr = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; type = "gem"; }; version = "1.2.4"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; type = "gem"; }; version = "2.6.1"; }; mongo = { dependencies = ["bson"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "19sihy8ihi3hmdg3gxbf4qvzmjnzx8xygg9534012j9z0wmhs7h1"; type = "gem"; }; version = "2.17.1"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; version = "4.0.6"; }; rchardet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; type = "gem"; }; version = "1.8.0"; }; } </ins>


(assertMacAddress "MACAddress") ]; <ins> # NOTE The PrivateKey directive is missing on purpose here, please # do not add it to this list. The nix store is world-readable let's # refrain ourselves from providing a footgun. checkWireGuard = checkUnitConfig "WireGuard" [ (assertOnlyFields [ "PrivateKeyFile" "ListenPort" "FwMark" ]) (assertRange "FwMark" 1 4294967295) ]; # NOTE The PresharedKey directive is missing on purpose here, please # do not add it to this list. The nix store is world-readable,let's # refrain ourselves from providing a footgun. checkWireGuardPeer = checkUnitConfig "WireGuardPeer" [ (assertOnlyFields [ "PublicKey" "PresharedKeyFile" "AllowedIPs" "Endpoint" "PersistentKeepalive" ]) (assertRange "PersistentKeepalive" 1 65535) ]; </ins> checkVlan = checkUnitConfig "VLAN" [ (assertOnlyFields ["Id" "GVRP" "MVRP" "LooseBinding" "ReorderHeader"]) (assertRange "Id" 0 4094)


index 0000000..44a7fbd --- /dev/null +++ b/dust.in <del> @@ -0,0 +1,43 @@ </del> <ins> @@ -0,0 +1,40 @@ </ins> +#!/usr/bin/env bash + +base_path=@basePath@ +pixie_path=@pixiePath@ <ins> +rlwrap_cmd=@rlwrapPath@ </ins> + +function set_load_path() { +    load_path=""


buildPythonPackage rec { pname = "msal-extensions"; <del> version = "1.1.0"; </del> <ins> version = "1.2.0"; </ins> pyproject = true; disabled = pythonOlder "3.7";


<ins> { lib , stdenv , fetchFromGitHub , substituteAll , python3 , ghostscript , coreutils , pdftk , poppler_utils }: let python-env = python3.withPackages (ps: with ps; [ tkinter ]); in stdenv.mkDerivation { pname = "pdf-sign"; version = "unstable-2023-08-08"; src = fetchFromGitHub { owner = "svenssonaxel"; repo = "pdf-sign"; rev = "98742c6b12ebe2ca3ba375c695f43b52fe38b362"; hash = "sha256-5GRk0T1iLqmvWI8zvZE3OWEHPS0/zN/Ie9brjZiFpqc="; }; patches = [ (substituteAll { src = ./use-nix-paths.patch; gs = "${ghostscript}/bin/gs"; mv = "${coreutils}/bin/mv"; pdftk = "${pdftk}/bin/pdftk"; pdfinfo = "${poppler_utils}/bin/pdfinfo"; }) ]; buildInputs = [ python-env ]; installPhase = '' runHook preInstall mkdir -p $out/bin cp pdf-sign pdf-create-empty $out/bin patchShebangs $out/bin runHook postInstall ''; meta = { description = "A tool to visually sign PDF files"; homepage = "https://github.com/svenssonaxel/pdf-sign"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.unix; }; } </ins>


sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; }; <del> # Build of golang.org/x/tools/gopls fails with: #   can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module. # In order to fix this, we simply remove the module. # Note that build of golang.org/x/tools/cmd/gopls provides identical binary as golang.org/x/tools/gopls. # See https://github.com/NixOS/nixpkgs/pull/64335. </del> <ins> # The gopls folder contains a Go submodule which causes a build failure. # Given that, we can't have the gopls binary be part of the gotools # derivation. # # The attribute "gopls" provides the gopls binary. # # Related # # * https://github.com/NixOS/nixpkgs/pull/85868 # * https://github.com/NixOS/nixpkgs/issues/88716 </ins> postPatch = '' rm -rf gopls '';


<ins> { lib , stdenv , autoPatchelfHook , boost , cmake , copyDesktopItems , imagemagick , fetchpatch , fetchzip , killall , libjpeg , libpng , libtiff , libtool , libusb1 , makeDesktopItem , qtbase , wrapQtAppsHook , withGui ? true , withNonFreePlugins ? false }: let pname = "epsonscan2"; description = "Epson Scan 2 scanner driver for many modern Epson scanners and multifunction printers"; version = "6.7.61.0"; system = stdenv.hostPlatform.system; src = fetchzip { url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/67/1a6447b4acc5568dfd970feba0518fabea35bca2/epsonscan2-${version}-1.src.tar.gz"; hash = "sha256-xwvdgmV6Mrs1RC18U2mA+HlTYybeYb0V5lz5hCvC7+8="; }; bundle = { "i686-linux" = fetchzip { name = "${pname}-bundle"; url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/69/3151031c0fb4deea3f48781fd051411b983ccee4/epsonscan2-bundle-${version}.i686.deb.tar.gz"; hash = "sha256-nq3Nqunt8aMcCf7U7JBYrVscvrhhcwcn8RlhYXLmC2c="; }; "x86_64-linux" = fetchzip { name = "${pname}-bundle"; url = "https://download3.ebz.epson.net/dsc/f/03/00/14/53/68/a5e06101ba3f328dd747888e3dddebbb677bb8c8/epsonscan2-bundle-${version}.x86_64.deb.tar.gz"; hash = "sha256-cFx54CKkZtvhZ5ABuBwB8+IzhT2lu8D3+GZFaMuWf3Y="; }; }."${system}" or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation { inherit pname src version; patches = [ ./build.patch (fetchpatch { url = "https://github.com/flathub/net.epson.epsonscan2/raw/master/patches/epsonscan2-crash.patch"; hash = "sha256-srMxlFfnZuJ3ed5veFcJIiZuW27F/3xOS0yr4ywn4FI="; }) (fetchpatch { url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/epsonscan2-oob-container.patch"; hash = "sha256-FhXZT0bIBYwdFow2USRJl8Q7j2eqpq98Hh0lHFQlUQY="; }) (fetchpatch { url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/epsonscan2-xdg-open.patch"; hash = "sha256-4ih3vZjPwWiiAxKfpLIwbbsk1K2oXSuxGbT5PVwfUsc="; }) ]; postPatch = '' substituteInPlace src/Controller/Src/Scanner/Engine.cpp  --replace '@KILLALL@' ${killall}/bin/killall substituteInPlace src/Controller/Src/Filter/GetOrientation.cpp  --replace '@OCR_ENGINE_GETROTATE@' $out/libexec/epsonscan2-ocr/ocr-engine-getrotate ''; nativeBuildInputs = [ cmake ] ++ lib.optionals withGui [ imagemagick # to make icons wrapQtAppsHook ] ++ lib.optionals withNonFreePlugins [ autoPatchelfHook ]; buildInputs = [ boost libjpeg libpng libtiff libusb1 ] ++ lib.optionals withGui [ copyDesktopItems qtbase ] ++ lib.optionals withNonFreePlugins [ libtool.lib ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" # The non-free (Debian) packages uses this directory structure so do the same when compiling # from source so we can easily merge them. "-DCMAKE_INSTALL_LIBDIR=lib/${system}-gnu" ] ++ lib.optionals (!withGui) [ "-DNO_GUI=ON" ]; postInstall = '' # But when we put all the libraries in lib/${system}-gnu, then SANE can't find the # required libraries so create a symlink to where it expects them to be. mkdir -p $out/lib/sane for file in $out/lib/${system}-gnu/sane/*.so.*; do ln -s $file $out/lib/sane/ done '' + lib.optionalString withGui '' # The icon file extension is .ico but it's actually a png! mkdir -p $out/share/icons/hicolor/{48x48,128x128}/apps convert $src/Resources/Icons/escan2_app.ico -resize 48x48 $out/share/icons/hicolor/48x48/apps/epsonscan2.png convert $src/Resources/Icons/escan2_app.ico -resize 128x128 $out/share/icons/hicolor/128x128/apps/epsonscan2.png '' + lib.optionalString withNonFreePlugins '' ar xf ${bundle}/plugins/epsonscan2-non-free-plugin_*.deb tar Jxf data.tar.xz cp -r usr/* $out ''; desktopItems = lib.optionals withGui [ (makeDesktopItem { name = pname; exec = "epsonscan2"; icon = "epsonscan2"; desktopName = "Epson Scan 2"; genericName = "Epson Scan 2"; comment = description; categories = [ "Graphics" "Scanning" ]; }) ]; meta = { inherit description; longDescription = '' Epson Scan 2 scanner driver including optional non-free plugins such as OCR and network scanning. To use the SANE backend: <literal> hardware.sane.extraBackends = [ pkgs.epsonscan2 ]; </literal> Overrides can be used to customise this package. For example, to enable non-free plugins and disable the Epson GUI: <literal> pkgs.epsonscan2.override { withNonFreePlugins = true; withGui = false; } </literal> ''; homepage = "https://support.epson.net/linux/en/epsonscan2.php"; platforms = [ "i686-linux" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ fromSource ] ++ lib.optionals withNonFreePlugins [ binaryNativeCode ]; license = with lib.licenses; if withNonFreePlugins then unfree else lgpl21Plus; maintainers = with lib.maintainers; [ james-atkins ]; }; } </ins>


hostKeyAlgorithms = mkOption { type = types.listOf types.str; <del> default = [ "+ssh-dss" ]; </del> <ins> default = []; </ins> example = [ "ssh-ed25519" "ssh-rsa" ]; description = '' Specifies the host key algorithms that the client wants to use in order of preference.


{ lib, fetchurl, makeDesktopItem, ffmpeg , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine <ins> , yt-dlp </ins> }: mkDerivation rec {


acpica-tools = callPackage ../tools/system/acpica-tools { }; <ins> amdgpu_top = callPackage ../tools/system/amdgpu_top { }; </ins> acquire = with python3Packages; toPythonApplication acquire; act = callPackage ../development/tools/misc/act { };


HOME=$(mktemp -d) py.test --pyargs borg.testsuite ''; <del> # 63 failures, needs pytest-benchmark </del> <ins> # 64 failures, needs pytest-benchmark </ins> doCheck = false; meta = with stdenv.lib; {


}; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 <del> graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas </del> <ins> graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile </ins> fftw fftwSinglePrec qrupdate ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla)


, libiconv ? null, ncurses <del> , enableDwarf ? !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isWindows, elfutils # for DWARF support </del> , useLLVM ? !stdenv.targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a


strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; stunnel = handleTest ./stunnel.nix {}; sudo = handleTest ./sudo.nix {}; <ins> swap-file-btrfs = handleTest ./swap-file-btrfs.nix {}; </ins> swap-partition = handleTest ./swap-partition.nix {}; sway = handleTest ./sway.nix {}; switchTest = handleTest ./switch-test.nix {};


owner = "deepmind"; repo = pname; rev = "v${version}"; <del> sha256 = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM="; </del> <ins> hash = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM="; </ins> }; propagatedBuildInputs = [


xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; <ins> xwaylandvideobridge = libsForQt5.callPackage ../tools/wayland/xwaylandvideobridge { }; </ins> yaws = callPackage ../servers/http/yaws { }; youtrack = callPackage ../servers/jetbrains/youtrack.nix { };


meta = { buildDocsInSandbox = false; <del> maintainers = with lib.maintainers; [ lom SuperSandro2000 ]; </del> <ins> maintainers = with lib.maintainers; [ SuperSandro2000 ]; </ins> }; }


<ins> { lib , stdenv , fetchFromGitHub , emptyDirectory , writeText , makeBinaryWrapper , gradle , jdk21 , llvmPackages }: let gradleInit = writeText "init.gradle" '' logger.lifecycle 'Replacing Maven repositories with empty directory...' gradle.projectsLoaded { rootProject.allprojects { buildscript { repositories { clear() maven { url '${emptyDirectory}' } } } repositories { clear() maven { url '${emptyDirectory}' } } } } settingsEvaluated { settings -> settings.pluginManagement { repositories { maven { url '${emptyDirectory}' } } } } ''; in stdenv.mkDerivation { pname = "jextract"; version = "unstable-2023-11-27"; src = fetchFromGitHub { owner = "openjdk"; repo = "jextract"; rev = "8730fcf05c229d035b0db52ee6bd82622e9d03e9"; # Update jextract 21 with latest fixes hash = "sha256-Wct/yx5C0EjDtDyXNYDH5LRmrfq7islXbPVIGBR6x5Y="; }; nativeBuildInputs = [ gradle makeBinaryWrapper ]; env = { ORG_GRADLE_PROJECT_llvm_home = llvmPackages.libclang.lib; ORG_GRADLE_PROJECT_jdk21_home = jdk21; }; buildPhase = '' runHook preBuild export GRADLE_USER_HOME=$(mktemp -d) gradle --console plain --init-script "${gradleInit}" assemble runHook postBuild ''; doCheck = true; checkPhase = '' runHook preCheck gradle --console plain --init-script "${gradleInit}" verify runHook postCheck ''; installPhase = '' runHook preInstall mkdir -p $out/opt/ cp -r ./build/jextract $out/opt/jextract makeBinaryWrapper "$out/opt/jextract/bin/jextract" "$out/bin/jextract" runHook postInstall ''; meta = with lib; { description = "A tool which mechanically generates Java bindings from a native library headers"; mainProgram = "jextract"; homepage = "https://github.com/openjdk/jextract"; platforms = jdk21.meta.platforms; license = licenses.gpl2Only; maintainers = with maintainers; [ sharzy ]; }; } </ins>


, rfc3987 , ruamel-yaml , setuptools-scm <ins> , libfdt </ins> }: buildPythonPackage rec { pname = "dtschema"; <del> version = "2022.01"; </del> <ins> version = "2022.12"; </ins> format = "setuptools"; disabled = pythonOlder "3.7";


<del> { lib , stdenv , fetchFromGitHub , makeWrapper , makeDesktopItem , copyDesktopItems , SDL2 , bzip2 , cmake , fluidsynth , game-music-emu , gtk3 , imagemagick , libGL , libjpeg , libsndfile , libvpx , libwebp , mpg123 , ninja , openal , pkg-config , vulkan-loader , zlib , zmusic }: stdenv.mkDerivation rec { pname = "gzdoom"; version = "4.12.2"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; hash = "sha256-taie1Iod3pXvuxxBC7AArmtndkIV0Di9mtJoPvPkioo="; }; outputs = [ "out" "doc" ]; nativeBuildInputs = [ cmake copyDesktopItems imagemagick makeWrapper ninja pkg-config ]; buildInputs = [ SDL2 bzip2 fluidsynth game-music-emu gtk3 libGL libjpeg libsndfile libvpx libwebp mpg123 openal vulkan-loader zlib zmusic ]; postPatch = '' substituteInPlace tools/updaterevision/UpdateRevision.cmake  --replace "ret_var(Tag)" "ret_var("${src.rev}")"  --replace "ret_var(Timestamp)" "ret_var("1970-00-00 00:00:00 +0000")"  --replace "ret_var(Hash)" "ret_var("${src.rev}")" ''; cmakeFlags = [ "-DDYN_GTK=OFF" "-DDYN_OPENAL=OFF" ]; desktopItems = [ (makeDesktopItem { name = "gzdoom"; exec = "gzdoom"; desktopName = "GZDoom"; comment = meta.description; icon = "gzdoom"; categories = [ "Game" ]; }) ]; postInstall = '' mv $out/bin/gzdoom $out/share/games/doom/gzdoom makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom for size in 16 24 32 48 64 128; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps convert -background none -resize "$size"x"$size" $src/src/win32/icon1.ico -flatten  $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png done; ''; meta = with lib; { homepage = "https://github.com/ZDoom/gzdoom"; description = "Modder-friendly OpenGL and Vulkan source port based on the DOOM engine"; mainProgram = "gzdoom"; longDescription = '' GZDoom is a feature centric port for all DOOM engine games, based on ZDoom, adding an OpenGL renderer and powerful scripting capabilities. ''; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ azahi lassulus ]; }; } </del>


]; qtWrapperArgs = [ <del> "--prefix PATH ':' ${lib.makeBinPath [ </del> <ins> "--prefix PATH : ${lib.makeBinPath [ </ins> cdrdao cdrtools dvdplusrwtools


freepats = callPackage ../data/misc/freepats { }; <ins> game-devices-udev-rules = callPackage ../os-specific/linux/game-devices-udev-rules { }; </ins> garamond-libre = callPackage ../data/fonts/garamond-libre { }; g15daemon = callPackage ../os-specific/linux/g15daemon { };


dontUnpack = true; <del> nativeBuildInputs = [ copyDesktopItems makeWrapper ]; </del> <ins> nativeBuildInputs = [ copyDesktopItems makeWrapper ]; </ins> installPhase = let <del> runtimeLibraries = [ libglvnd libpulseaudio udev xorg.libXxf86vm ] ++ lib.optional gamemodeSupport gamemode.lib ++ lib.optional textToSpeechSupport flite ++ additionalLibs; </del> <ins> runtimeLibraries = [ libglvnd libpulseaudio udev xorg.libX11 xorg.libXcursor xorg.libXxf86vm ] ++ lib.optional gamemodeSupport gamemode.lib ++ lib.optional textToSpeechSupport flite ++ additionalLibs; </ins> in '' runHook preInstall


mandoc = callPackage ../tools/misc/mandoc { }; <ins> mangohud = callPackage ../tools/graphics/mangohud/combined.nix { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; </ins> manix = callPackage ../tools/nix/manix { inherit (darwin.apple_sdk.frameworks) Security; };


buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ]; <del> # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; </del> # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally postPatch = "sed -i s/-O1/-O2/ configure";


{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, <del> libminc, EBTKS }: </del> <ins> libminc, ebtks }: </ins> stdenv.mkDerivation rec { pname = "inormalize";


, lilv , makeFontsConf , nixosTests <del> , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind </del> , valgrind <del> , libcameraSupport ? true </del> , libcamera , libdrm <del> , gstreamerSupport ? true </del> , gst_all_1 <del> , ffmpegSupport ? true </del> , ffmpeg <del> , bluezSupport ? true </del> , bluez , sbc , libfreeaptx , liblc3 , fdk_aac , libopus <del> , ldacbtSupport ? bluezSupport && lib.meta.availableOn stdenv.hostPlatform ldacbt </del> , ldacbt <del> , nativeHspSupport ? true , nativeHfpSupport ? true , nativeModemManagerSupport ? true </del> , modemmanager <del> , ofonoSupport ? true , hsphfpdSupport ? true , pulseTunnelSupport ? true </del> , libpulseaudio , zeroconfSupport ? true , avahi , raopSupport ? true , openssl <del> , opusSupport ? true </del> , rocSupport ? true , roc-toolkit , x11Support ? true , libcanberra , xorg <del> , mysofaSupport ? true </del> , libmysofa , ffadoSupport ? x11Support && lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform , ffado , libselinux }: <del> # Bluetooth codec only makes sense if general bluetooth enabled assert ldacbtSupport -> bluezSupport; </del> stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; version = "1.2.1";


testScript = {nodes, ...}: let <ins> caDomain = nodes.acme.config.test-support.acme.caDomain; </ins> newServerSystem = nodes.webserver.config.system.build.toplevel; switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test"; in


nativeBuildInputs = [ fakeroot ] ++ optionals enableFakechroot [ <del> fakechroot # for chroot coreutils # fakechroot needs getopt, which is provided by util-linux util-linux </del> <ins> proot </ins> ]; postBuild = '' mv $out old_out (cd old_out; eval "$extraCommands" ) mkdir $out <del> ${optionalString enableFakechroot '' export FAKECHROOT_EXCLUDE_PATH=/dev:/proc:/sys:${builtins.storeDir}:$out/layer.tar ''} ${optionalString enableFakechroot ''fakechroot chroot $PWD/old_out ''}fakeroot bash -c ' </del> <ins> ${optionalString enableFakechroot ''proot -r $PWD/old_out ${bind-paths} --pwd=/ ''}fakeroot bash -c ' </ins> source $stdenv/setup ${optionalString (!enableFakechroot) ''cd old_out''} eval "$fakeRootCommands"


dotnetFixupHook() { echo "Executing dotnetFixupPhase" <del> if [ "${executables-}" ]; then </del> <ins> # check if executables is declared (including empty values, in which case we generate no executables) if declare -p executables &>/dev/null; then </ins> for executable in ${executables[@]}; do path="${installPath-$out/lib/$pname}/$executable"


libPath = filter (pkgs.path + "/lib"); pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib"); nixosPath = filter (pkgs.path + "/nixos"); <del> modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy; </del> <ins> modules = "[ " + concatMapStringsSep " " (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy + " ]"; passAsFile = [ "modules" ]; </ins> } '' export NIX_STORE_DIR=$TMPDIR/store export NIX_STATE_DIR=$TMPDIR/state


<del> { lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline }: </del> <ins> { lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline, copyDesktopItems, makeDesktopItem }: </ins> stdenv.mkDerivation rec { pname = "gnubg";


dontWrapPythonPrograms = true; installPhase = '' <del> make install DESTDIR=$out PREFIX= USE_SYSTEMD=0 USE_NFTABLES=1 </del> <ins> make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1 </ins> wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh  --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]}


libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in stdenv.mkDerivation rec { name = "multimc-${version}"; <del> version = "0.6.2"; </del> <ins> # Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see # https://github.com/NixOS/nixpkgs/issues/42387 version = "unstable-2018-06-04"; </ins> src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; <del> rev = version; sha256 = "07jrr6si8nzfqwf073zhgw47y6snib23ad3imh1ik1nn5r7wqy3c"; </del> <ins> rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071"; sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0"; </ins> fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ];


fractal = callPackage ../applications/networking/instant-messengers/fractal { }; <ins> fragments = callPackage ../applications/networking/p2p/fragments { }; </ins> freecad = libsForQt5.callPackage ../applications/graphics/freecad { inherit (python3Packages) GitPython


else if isString v then v else if true  == v then "true" else if false == v then "false" <del> else if isSecret v then v._secret </del> <ins> else if isSecret v then hashString "sha256" v._secret </ins> else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}"; }; }; secretPaths = lib.mapAttrsToList (_: v: v._secret) (lib.filterAttrs (_: isSecret) cfg.config); mkSecretReplacement = file: '' <del> replace-secret ${escapeShellArgs [ file file "${cfg.dataDir}/.env" ]} </del> <ins> replace-secret ${escapeShellArgs [ (builtins.hashString "sha256" file) file "${cfg.dataDir}/.env" ]} </ins> ''; secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths; filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ {} null ])) cfg.config;


SysVirt = buildPerlModule rec { pname = "Sys-Virt"; <del> version = "8.4.0"; </del> <ins> version = "8.5.0"; </ins> src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; <del> sha256 = "sha256-nw9KG3dO0Oxre2NVp+4Z+kgIluU5j1xOu8grZJRXhik="; </del> <ins> sha256 = "sha256-VuM4rPrG15vXnF5e1MBSGB76zLI+8nkSiJmwWg8aJgE="; </ins> }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];


<ins> { buildGoModule , cairo , fetchFromGitHub , gdk-pixbuf , glib , gobject-introspection , graphene , gtk4 , lib , pango , pkg-config }: buildGoModule rec { pname = "gtkcord4"; version = "0.0.6"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; hash = "sha256-uEG1pAHMQT+C/E5rKByflvL0NNkC8SeSPMAXanzvhE4="; }; nativeBuildInputs = [ gobject-introspection pkg-config ]; buildInputs = [ cairo gdk-pixbuf glib graphene gtk4 pango ]; vendorHash = "sha256-QZSjSk1xu5ZcrNEra5TxnUVvlQWb5/h31fm5Nc7WMoI="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4."; homepage = "https://github.com/diamondburned/gtkcord4"; license = licenses.gpl3Only; maintainers = with maintainers; [ urandom ]; }; } </ins>


fi EXTRA_DIST =  <ins> diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in index 474ce8a8..ee30808e 100644 </ins> --- a/setup/ibus-setup.in +++ b/setup/ibus-setup.in <del> @@ -27,5 +27,5 @@ </del> <ins> @@ -27,5 +27,5 @@ export IBUS_PREFIX=@prefix@ </ins> export IBUS_DATAROOTDIR=@datarootdir@ export IBUS_LOCALEDIR=@localedir@ export IBUS_LIBEXECDIR=${libexecdir} <del> -exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py $@ +exec @pythonInterpreter@ @prefix@/share/ibus/setup/main.py $@ </del> <ins> -exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py "$@" +exec @pythonInterpreter@ @prefix@/share/ibus/setup/main.py "$@" </ins>


odin = callPackage ../development/compilers/odin { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; <ins> llvmPackages = llvmPackages_18; </ins> }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };


<ins> { stdenv, lib, buildPythonPackage, fetchFromGitHub, setuptools, bitmath, bpylist2, click, mako, more-itertools, objexplore, packaging, pathvalidate, pip, ptpython, pytimeparse2, pyyaml, requests, rich-theme-manager, rich, shortuuid, strpdatetime, tenacity, textx, toml, wrapt, wurlitzer, xdg-base-dirs, pytestCheckHook, pytest-mock, }: buildPythonPackage rec { pname = "osxphotos"; version = "0.68.2"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "osxphotos"; rev = "refs/tags/v${version}"; hash = "sha256-iPeidbPoF0AG6TJDWloXwpwzJ4oWEglKVLp2yywnyZs="; }; build-system = [ setuptools ]; dependencies = [ bitmath bpylist2 click mako more-itertools objexplore packaging pathvalidate pip ptpython pytimeparse2 pyyaml requests rich-theme-manager rich shortuuid strpdatetime tenacity textx toml wrapt wurlitzer xdg-base-dirs ]; pythonRelaxDeps = [ "mako" "more-itertools" "objexplore" "textx" ]; pythonImportsCheck = [ "osxphotos" ]; nativeCheckInputs = [ pytestCheckHook pytest-mock ]; preCheck = '' export HOME=$(mktemp -d) ''; disabledTestPaths = [ "tests/test_comments.py" ]; disabledTests = [ "test_iphoto_info" "test_from_to_date_tz" "test_function_url" "test_get_local_tz" "test_datetime_naive_to_local" "test_from_to_date_tz" "test_query_from_to_date_alt_location" "test_query_function_url" ]; meta = { description = "Export photos from Apple's macOS Photos app and query the Photos library database to access metadata about images"; homepage = "https://github.com/RhetTbull/osxphotos"; changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; broken = stdenv.isDarwin; }; } </ins>


<del> { stdenv, buildPythonPackage, fetchFromGitHub, six, hypothesis, mock </del> <ins> { stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock </ins> , python-Levenshtein, pytest }: buildPythonPackage rec {


cp -R "usr/share" "$out/share" chmod -R g-w "$out" <del> # Wrap the startup command makeBinaryWrapper $out/opt/GoofCord/goofcord $out/bin/goofcord  </del> <ins> # use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion # see https://github.com/NixOS/nixpkgs/issues/172583 makeShellWrapper $out/opt/GoofCord/goofcord $out/bin/goofcord  </ins> "''${gappsWrapperArgs[@]}"  --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/"  --add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}"


postInstall = let includedLibs = [ "base" "contrib" "network" "prelude" ]; name = "${pname}-${version}"; <del> packagePaths = builtins.map (l: "$out/${name}/" + l) includedLibs; </del> <ins> packagePaths = builtins.map (l: "$out/${name}/${l}-${version}") includedLibs; </ins> additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths; in '' # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH


*x-nixos.autoresize*) if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then echo "resizing $device..." <ins> e2fsck -fp "$device" </ins> resize2fs "$device" fi ;;


]; cmakeFlags = [ <del> "-DGLSLANG_INSTALL_DIR=${localGlslang}" "-DSPIRV_HEADERS_INSTALL_DIR=${localSpirvHeaders}" </del> <ins> "-DGLSLANG_INSTALL_DIR=${glslang}" "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" </ins> "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" # Hide dev warnings that are useless for packaging


<del> { lib </del> <ins> { stdenv , lib </ins> , buildPythonPackage , fetchFromGitHub , isPy27


''; }; <del> # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) </del> pubkeyAcceptedKeyTypes = mkOption { type = types.listOf types.str; <del> default = [ "+ssh-dss" ]; </del> <ins> default = []; </ins> example = [ "ssh-ed25519" "ssh-rsa" ]; description = '' Specifies the key types that will be used for public key authentication.


# https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf "char-nvidiactl" "char-nvidia-caps" <ins> "char-nvidia-frontend" </ins> "char-nvidia-uvm" # ROCm "char-drm"


<del> { lib, pkgs, erlang }: </del> <ins> { lib, __splicedPackages, erlang }: </ins> let <ins> pkgs = __splicedPackages; </ins> inherit (lib) makeExtensible; lib' = pkgs.callPackage ./lib.nix { };


<ins> diff --git a/bin/rocprofv2 b/bin/rocprofv2 index 92f7489..8839d4d 100755 --- a/bin/rocprofv2 +++ b/bin/rocprofv2 @@ -2,7 +2,8 @@ set -eo pipefail CURRENT_DIR="$(dirname -- "$0")" ROCPROFV2_DIR=$(dirname -- $(realpath ${BASH_SOURCE[0]})) -ROCM_DIR=$(dirname -- "$ROCPROFV2_DIR") +ROCPROFILER_DIR=$(dirname -- "$ROCPROFV2_DIR") +ROCM_DIR=@rocmtoolkit_merged@ PLUGIN_LIST=("ctf" "perfetto" "file" "att") RUN_FROM_BUILD=0 if [[ $ROCPROFV2_DIR == *"/build"* ]]; then @@ -10,7 +11,7 @@ if [[ $ROCPROFV2_DIR == *"/build"* ]]; then ROCM_DIR=$ROCPROFV2_DIR fi -export ROCPROFILER_METRICS_PATH=$ROCM_DIR/libexec/rocprofiler/counters/derived_counters.xml +export ROCPROFILER_METRICS_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/counters/derived_counters.xml export LD_LIBRARY_PATH=$ROCM_DIR/lib:$LD_LIBRARY_PATH usage() { @@ -70,8 +71,8 @@ while [ 1 ]; do exit 1 fi elif [[ "$1" = "--list-counters" ]]; then -    export LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so -    eval $ROCM_DIR/libexec/rocprofiler/ctrl +    export LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so +    eval $ROCPROFILER_DIR/libexec/rocprofiler/ctrl exit 1 elif [[ "$1" = "-i" || "$1" = "--input" ]]; then if [ $2 ] && [ -n $2 ] && [ -r $2 ]; then @@ -171,7 +172,7 @@ while [ 1 ]; do if [ $RUN_FROM_BUILD == 1 ]; then ATT_PATH=$ROCM_DIR/plugin/att/att/att.py else -        ATT_PATH=$ROCM_DIR/libexec/rocprofiler/att/att.py +        ATT_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/att/att.py export ROCPROFV2_ATT_LIB_PATH=$ROCM_DIR/lib/hsa-amd-aqlprofile/librocprofv2_att.so fi ATT_ARGV=$3 @@ -236,13 +237,13 @@ if [ -n "$PMC_LINES" ] && [ ! -n "$ATT_ARGV" ]; then export OUTPUT_PATH=$FINAL_PATH fi let COUNTER=COUNTER+1 -    LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $* +    LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $* if [ -n "$OUTPUT_PATH" ]; then echo -e "nThe output path for the following counters: $OUTPUT_PATH" fi done else -  LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $* +  LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $* fi get_pmc_results_txt_path() { diff --git a/bin/rpl_run.sh b/bin/rpl_run.sh index c1a3daa..bc868a5 100755 --- a/bin/rpl_run.sh +++ b/bin/rpl_run.sh @@ -24,16 +24,17 @@ time_stamp=`date +%y%m%d_%H%M%S` BIN_DIR=$(dirname $(realpath ${BASH_SOURCE[0]})) -ROOT_DIR=$(dirname $BIN_DIR) +ROCPROFILER_DIR=$(dirname $BIN_DIR) +ROOT_DIR=@rocmtoolkit_merged@ RUN_DIR=`pwd` TMP_DIR="/tmp" DATA_DIR="rpl_data_${time_stamp}_$$" -RPL_PATH=$ROOT_DIR/lib +RPL_PATH=$ROCPROFILER_DIR/lib TLIB_PATH=$RPL_PATH/rocprofiler TTLIB_PATH=$ROOT_DIR/lib/roctracer ROCM_LIB_PATH=$ROOT_DIR/lib -PROF_BIN_DIR=$ROOT_DIR/libexec/rocprofiler +PROF_BIN_DIR=$ROCPROFILER_DIR/libexec/rocprofiler if [ -z "$ROCP_PYTHON_VERSION" ] ; then ROCP_PYTHON_VERSION=python3 @@ -73,7 +74,7 @@ export ROCP_METRICS=$TLIB_PATH/metrics.xml # Disable AQL-profile read API export AQLPROFILE_READ_API=0 # ROC Profiler package path -export ROCP_PACKAGE_DIR=$ROOT_DIR +export ROCP_PACKAGE_DIR=$ROCPROFILER_DIR # enabled SPM KFD mode export ROCP_SPM_KFD_MODE=1 @@ -350,7 +351,7 @@ convert_time_val() { ################################################################################################ # main -echo "RPL: on '$time_stamp' from '$ROOT_DIR' in '$RUN_DIR'" +echo "RPL: on '$time_stamp' from '$ROCPROFILER_DIR' in '$RUN_DIR'" # Parsing arguments if [ -z "$1" ] ; then usage @@ -557,7 +558,7 @@ elif [ "$input_type" = "txt" -o "$input_type" = "none" ] ; then else echo "<metric></metric>" > $RES_DIR/input.xml fi -  input_list=`/bin/ls $RES_DIR/input*.xml` +  input_list=`ls $RES_DIR/input*.xml` export ROCPROFILER_SESS=$RES_DIR else fatal "Bad input file type '$INPUT_FILE'" </ins>


, stdenv , fetchFromGitHub , rocmUpdateScript <ins> , symlinkJoin , substituteAll </ins> , cmake , clang , clr <ins> , rocm-core </ins> , rocm-thunk <ins> , rocm-device-libs </ins> , roctracer <ins> , rocdbgapi </ins> , rocm-smi , hsa-amd-aqlprofile-bin , numactl


license = licenses.unfreeRedistributable; maintainers = with maintainers; [ MP2E ]; platforms = platforms.linux; <ins> broken = kernel.kernelOlder "3.2.0"; </ins> }; }


forgejo = handleTest ./forgejo.nix { }; freenet = handleTest ./freenet.nix {}; freeswitch = handleTest ./freeswitch.nix {}; <ins> freetube = discoverTests (import ./freetube.nix); </ins> freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; frigate = handleTest ./frigate.nix {};


"-DMZ_OPENSSL=ON" "-DMZ_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" <ins> "-DMZ_LIB_SUFFIX='-ng'" </ins> ] ++ lib.optionals stdenv.isDarwin [ # missing header file "-DMZ_LIBCOMP=OFF"


homepage = "https://github.com/electron/electron"; license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; <del> platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; </del> <ins> platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; </ins> sourceProvenance = with sourceTypes; [ binaryNativeCode ]; knownVulnerabilities = optional (versionOlder version "15.0.0") "Electron version ${version} is EOL"; };


// Insist on using IPC for communicating with Tor // <del> // Defaults to creating $TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket </del> <ins> // Defaults to creating $XDG_RUNTIME_DIR/Tor/{socks,control}.socket </ins> lockPref("extensions.torlauncher.control_port_use_ipc", true); lockPref("extensions.torlauncher.socks_port_use_ipc", true);


cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12 cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs"; # Added 2020-06-05 checkbashism = throw "'checkbashism' has been renamed to/replaced by 'checkbashisms'"; # Converted to throw 2022-02-22 <ins> chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 </ins> chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07


installPhase = '' mkdir -p $out/bin <del> cp git-open $out/bin </del> <ins> mv git-open $out/bin </ins> installManPage git-open.1 wrapProgram $out/bin/git-open  <del> --prefix PATH : "${lib.makeBinPath [ git gnugrep ]}"  </del> <ins> --prefix PATH : "${lib.makeBinPath [ gnugrep ]}"  </ins> --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" '';


defaultBuildInputs = extraBuildInputs; <ins> stdenv = (stdenv-overridable argsStdenv); </ins> # The stdenv that we are producing. <del> stdenv = </del> <ins> in </ins> derivation ( lib.optionalAttrs (allowedRequisites != null) { allowedRequisites = allowedRequisites


++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; <del> knownVulnerabilities = optional (versionOlder version "15.0.0") "Electron version ${version} is EOL"; </del> <ins> knownVulnerabilities = optional (versionOlder version "18.0.0") "Electron version ${version} is EOL"; </ins> }; fetcher = vers: tag: hash: fetchurl {


# TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt <del> then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVer}".libraries </del> <ins> then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVersion}".libraries </ins> else callPackage ../os-specific/linux/bionic-prebuilt { }; boolstuff = callPackage ../development/libraries/boolstuff { };


buildPythonPackage rec { pname = "pex"; <del> version = "2.1.137"; </del> <ins> version = "2.1.141"; </ins> format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; <del> hash = "sha256-ywzmz2R1fdW6TzTEYHq0hfeQnmwkzUecoozlIgXw7es="; </del> <ins> hash = "sha256-EsIurZNgWslUciz5Pc2hj2F4tAJ8hQydRWnVIWdryDc="; </ins> }; nativeBuildInputs = [


python2Full = python2.override{x11Support=true;}; python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; <del> python35Full = python35.override{x11Support=true;}; </del> python36Full = python36.override{x11Support=true;}; python37Full = python37.override{x11Support=true;}; python38Full = python38.override{x11Support=true;};


<ins> { stdenv , lib , fetchFromGitHub , pkg-config , autoreconfHook , autoconf-archive , guile , texinfo , rofi }: stdenv.mkDerivation rec { pname = "pinentry-rofi"; version = "2.0.3"; src = fetchFromGitHub { owner = "plattfot"; repo = pname; rev = version; sha256 = "sha256-EzbeMAhdn9SuSmE+aMHeyuje3s74isIKRDTrFO3bX04="; }; nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config texinfo ]; buildInputs = [ guile ]; propagatedBuildInputs = [ rofi ]; meta = with lib; { description = "Rofi frontend to pinentry"; homepage = "https://github.com/plattfot/pinentry-rofi"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ seqizz ]; }; } </ins>


owner = "OctoPrint"; repo = "OctoPrint"; rev = version; <del> hash = "sha256-SYN/BrcukHMDwk70XGu/pO45fSPr/KOEyd4wxtz2Fo0="; </del> <ins> hash = "sha256-71uE8JvcS++xH8WSVWj5x0+9s3XIwf3A64c6YtxpSRc="; </ins> }; propagatedBuildInputs = with self; [


LDFLAGS = "-Wl,-rpath,${placeholder "out"}/lib/${binaryName}"; }; <ins> # workaround for clang statically linking against libstdc++ NIX_LDFLAGS = lib.optionals stdenv.cc.isGNU [ "-L${stdenv.cc.cc.lib}/lib" ]; </ins> # tests were disabled in configureFlags doCheck = false;


{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which, ncurses <del> , autoreconfHook </del> <ins> , autoreconfHook, fetchpatch </ins> , git , texinfo , qtbase ? null


<del> { lib </del> <ins> { stdenv , lib </ins> , buildPythonPackage , fetchpatch , fetchPypi


gsound gtk3 json-glib <del> libsoup </del> <ins> libsoup # referenced in js/ui/environment.js </ins> libstartup_notification libXtst libXdamage


with stdenv.lib; stdenv.mkDerivation rec { <del> name = "corosync-2.4.3"; </del> <ins> pname = "corosync"; version = "2.4.5"; </ins> src = fetchurl { <del> url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; sha256 = "15y5la04qn2lh1gabyifygzpa4dx3ndk5yhmaf7azxyjx0if9rxi"; </del> <ins> url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb"; </ins> }; nativeBuildInputs = [ makeWrapper pkgconfig ];


viw = callPackage ../applications/editors/viw { }; <ins> virter = callPackage ../applications/virtualization/virter { }; </ins> virt-viewer = callPackage ../applications/virtualization/virt-viewer { }; virt-top = callPackage ../applications/virtualization/virt-top { };


iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; <ins> ipfetch = callPackage ../tools/networking/ipfetch { }; </ins> ipfs = callPackage ../applications/networking/ipfs { buildGoModule = buildGo116Module; };


dotnet-sdk_7 = dotnetCorePackages.sdk_7_0; dotnet-runtime_3 = dotnetCorePackages.runtime_3_1; <del> dotnet-runtime_5 = dotnetCorePackages.runtime_5_0; </del> dotnet-runtime_6 = dotnetCorePackages.runtime_6_0; dotnet-runtime_7 = dotnetCorePackages.runtime_7_0; dotnet-aspnetcore_3 = dotnetCorePackages.aspnetcore_3_1; <del> dotnet-aspnetcore_5 = dotnetCorePackages.aspnetcore_5_0; </del> dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0; dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0;


environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; <del> systemd.tmpfiles.rules = optionals (any (s: s.updateWtmp) (attrValues config.security.pam.services)) [ "f /var/log/wtmp" "f /var/log/lastlog" ]; </del> security.pam.services = { other.text = ''


export PERLPATH ''; <del> configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-openldap" "--with-db" "--with-db-inc=${db.dev}/include" "--with-db-lib=${db.out}/lib" "--with-sasl=${cyrus_sasl.dev}" "--with-netsnmp=yes" "--with-netsnmp-inc=${lib.getDev net-snmp}/include" "--with-netsnmp-lib=${lib.getLib net-snmp}/lib" ]; </del> <ins> configureFlags = let mkEnable = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in [ "--enable-cmocka" "--localstatedir=/var" "--sysconfdir=/etc" "--with-db-inc=${db.dev}/include" "--with-db-lib=${db.out}/lib" "--with-db=yes" "--with-netsnmp-inc=${lib.getDev net-snmp}/include" "--with-netsnmp-lib=${lib.getLib net-snmp}/lib" "--with-netsnmp=yes" "--with-openldap" "${mkEnable enableCockpit "cockpit"}" "${mkEnable enablePamPassthru "pam-passthru"}" "${mkEnable enableDna "dna"}" "${mkEnable enableLdapi "ldapi"}" "${mkEnable enableAutobind "autobind"}" "${mkEnable enableAutoDnSuffix "auto-dn-suffix"}" "${mkEnable enableBitwise "bitwise"}" "${mkEnable enableAcctPolicy "acctpolicy"}" "${mkEnable enablePosixWinsync "posix-winsync"}" ]; </ins> enableParallelBuilding = true; <ins> doCheck = true; </ins> installFlags = [ "sysconfdir=${placeholder "out"}/etc" "localstatedir=${placeholder "TMPDIR"}"


<del> { stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }: </del> <ins> { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: </ins> let <del> ver_maj = "0.18"; </del> <ins> ver_maj = "0.20"; </ins> ver_min = "0"; in stdenv.mkDerivation rec {


--offline ) <del> local -r tmpDir="$(mktemp -d yarnInstallHook.XXXXXX)" </del> <ins> local -r tmpDir="$(mktemp -d)" </ins> # yarn pack does not work at all with bundleDependencies. # Since we are imediately unpacking, we can just remove them from package.json


{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, <del> libminc, EBTKS }: </del> <ins> libminc, ebtks }: </ins> stdenv.mkDerivation rec { pname = "N3";


propagatedBuildInputs = [ ncurses zlib ]; <ins> patches = [ # Force a test to evaluate the saved benchmark for a CPU for which LLVM has # an execution model. See NixOS/nixpkgs#119673. ../../exegesis-force-bdver2.patch ]; </ins> postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake  --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)"


# this also disables necessary patches contained in `ollama/llm/patches/` # those patches are applied in `postPatch` ./disable-git.patch <ins> # we provide our own deps at runtime ./skip-rocm-cp.patch </ins> ]; postPatch = ''


<del> { config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config </del> <ins> { config, lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config </ins> , libiconv, CoreAudio, AudioUnit, VideoToolbox , alsaSupport ? stdenv.isLinux, alsa-lib ? null


, fetchurl , autoPatchelfHook , dpkg <del> , makeBinaryWrapper </del> <ins> , makeShellWrapper </ins> , wrapGAppsHook3 , alsa-lib , at-spi2-atk


<ins> { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "devspace"; version = "5.18.4"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; sha256 = "0s5117cgxgrxfki5drvg6d22dvrjffa03bi644zdl1p631r599r1"; }; vendorSha256 = null; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; # Check are disable since they requiered a working K8S cluster # TODO: add a nixosTest to be able to perform the package check doCheck = false; meta = with lib; { description = "DevSpace is an open-source developer tool for Kubernetes that lets you develop and deploy cloud-native software faster"; homepage = "https://devspace.sh/"; changelog = "https://github.com/loft-sh/devspace/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ darkonion0 ]; }; } </ins>


<ins> { config, lib, pkgs, utils, ... }: let inherit (lib) mkEnableOption mkPackageOption mkOption mkIf mkDefault types optionals getExe; inherit (utils) escapeSystemdExecArgs; cfg = config.services.sunshine; # ports used are offset from a single base port, see https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#port generatePorts = port: offsets: map (offset: port + offset) offsets; defaultPort = 47989; appsFormat = pkgs.formats.json { }; settingsFormat = pkgs.formats.keyValue { }; appsFile = appsFormat.generate "apps.json" cfg.applications; configFile = settingsFormat.generate "sunshine.conf" cfg.settings; in { options.services.sunshine = with types; { enable = mkEnableOption "Sunshine, a self-hosted game stream host for Moonlight"; package = mkPackageOption pkgs "sunshine" { }; openFirewall = mkOption { type = bool; default = false; description = '' Whether to automatically open ports in the firewall. ''; }; capSysAdmin = mkOption { type = bool; default = false; description = '' Whether to give the Sunshine binary CAP_SYS_ADMIN, required for DRM/KMS screen capture. ''; }; settings = mkOption { default = { }; description = '' Settings to be rendered into the configuration file. If this is set, no configuration is possible from the web UI. See https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#configuration for syntax. ''; example = '' { sunshine_name = "nixos"; } ''; type = submodule (settings: { freeformType = settingsFormat.type; options.port = mkOption { type = port; default = defaultPort; description = '' Base port -- others used are offset from this one, see https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#port for details. ''; }; }); }; applications = mkOption { default = { }; description = '' Configuration for applications to be exposed to Moonlight. If this is set, no configuration is possible from the web UI, and must be by the `settings` option. ''; example = '' { env = { PATH = "$(PATH):$(HOME)/.local/bin"; }; apps = [ { name = "1440p Desktop"; prep-cmd = [ { do = "''${pkgs.kdePackages.libkscreen}/bin/kscreen-doctor output.DP-4.mode.2560x1440@144"; undo = "''${pkgs.kdePackages.libkscreen}/bin/kscreen-doctor output.DP-4.mode.3440x1440@144"; } ]; exclude-global-prep-cmd = "false"; auto-detach = "true"; } ]; } ''; type = submodule { options = { env = mkOption { default = { }; description = '' Environment variables to be set for the applications. ''; type = attrsOf str; }; apps = mkOption { default = [ ]; description = '' Applications to be exposed to Moonlight. ''; type = listOf attrs; }; }; }; }; }; config = mkIf cfg.enable { services.sunshine.settings.file_apps = mkIf (cfg.applications.apps != [ ]) "${appsFile}"; environment.systemPackages = [ cfg.package ]; networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = generatePorts cfg.settings.port [ (-5) 0 1 21 ]; allowedUDPPorts = generatePorts cfg.settings.port [ 9 10 11 13 21 ]; }; boot.kernelModules = [ "uinput" ]; services.udev.packages = [ cfg.package ]; services.avahi = { enable = mkDefault true; publish = { enable = mkDefault true; userServices = mkDefault true; }; }; security.wrappers.sunshine = mkIf cfg.capSysAdmin { owner = "root"; group = "root"; capabilities = "cap_sys_admin+p"; source = getExe cfg.package; }; systemd.user.services.sunshine = { description = "Self-hosted game stream host for Moonlight"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; wants = [ "graphical-session.target" ]; after = [ "graphical-session.target" ]; startLimitIntervalSec = 500; startLimitBurst = 5; serviceConfig = { # only add configFile if an application or a setting other than the default port is set to allow configuration from web UI ExecStart = escapeSystemdExecArgs ([ (if cfg.capSysAdmin then "${config.security.wrapperDir}/sunshine" else "${getExe cfg.package}") ] ++ optionals (cfg.applications.apps != [ ] || (builtins.length (builtins.attrNames cfg.settings) > 1 || cfg.settings.port != defaultPort)) [ "${configFile}" ]); Restart = "on-failure"; RestartSec = "5s"; }; }; }; } </ins>


./services/web-apps/cryptpad.nix ./services/web-apps/documize.nix ./services/web-apps/frab.nix <ins> ./services/web-apps/gotify-server.nix </ins> ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/limesurvey.nix


buildPythonPackage rec { pname = "flax"; <del> version = "0.6.0"; </del> <ins> version = "0.6.1"; </ins> src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; <del> sha256 = "sha256-egTYYFZxhE/Kk7jXRi1HmjCjyFia2LoRigH042isDu0="; </del> <ins> sha256 = "sha256-fZiODo+izOwGjCCTvi11GvUG/VQL1DV9bNXKjvIIw4A="; </ins> }; <del> patches = [ # Bump rich dependency, should be fixed in releases after 0.6.0 # https://github.com/google/flax/pull/2407 (fetchpatch { url = "https://github.com/google/flax/commit/72189153f9779022b97858ae747c23fbaf571e3d.patch"; sha256 = "sha256-hKOn/M7qpBM6R1RIJpnXpRoZgIHqkwQZApN4L0fBzIE="; name = "bump_rich_dependency.patch"; }) ]; </del> buildInputs = [ jaxlib ]; propagatedBuildInputs = [


lib.fakeSha256; inherit url change state channel; <ins> impureEnvVars = lib.fetchers.proxyImpureEnvVars; </ins> } )


ninja pkg-config python3 <ins> rustPlatform.cargoSetupHook rustc </ins> wrapGAppsHook ];


qdarkstyle ]; <del> preBuild = '' </del> <ins> postPatch = '' # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt  --replace "protobuf>=3.12,<4" "protobuf>=3.12" # ... and regenerating the paymentrequest_pb2.py file protoc --python_out=. electrum/paymentrequest.proto </ins> substituteInPlace ./electrum/ecc_fast.py  --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then ''


<ins> { config , lib , pkgs , ... }: let cfg = config.services.realm; configFormat = pkgs.formats.json { }; configFile = configFormat.generate "config.json" cfg.config; inherit (lib) mkEnableOption mkPackageOption mkOption mkIf types getExe; in { meta.maintainers = with lib.maintainers; [ ocfox ]; options = { services.realm = { enable = mkEnableOption "A simple, high performance relay server written in rust"; package = mkPackageOption pkgs "realm" { }; config = mkOption { type = types.submodule { freeformType = configFormat.type; }; default = { }; description = '' The realm configuration, see <https://github.com/zhboner/realm#overview> for documentation. ''; }; }; }; config = mkIf cfg.enable { systemd.services.realm = { serviceConfig = { DynamicUser = true; MemoryDenyWriteExecute = true; PrivateDevices = true; ProtectClock = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectProc = "invisible"; ProtectKernelTunables = true; ExecStart = "${getExe cfg.package} --config ${configFile}"; AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_BIND_SERVICE" ]; }; wantedBy = [ "multi-user.target" ]; }; }; } </ins>


# there is at least one "privileged" account that has a # password or an SSH authorized key. Privileged accounts are # root and users in the wheel group. <del> assertion = !cfg.mutableUsers -> any id ((mapAttrsToList (_: cfg: (cfg.name == "root" </del> <ins> # The check does not apply when users.disableLoginPossibilityAssertion # The check does not apply when users.mutableUsers assertion = !cfg.mutableUsers -> !cfg.allowNoPasswordLogin -> any id (mapAttrsToList (name: cfg: (name == "root" </ins> || cfg.group == "wheel" || elem "wheel" cfg.extraGroups) &&