jiebi/CodeConvo huggingface dataset:
{file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ <del> {file = "boto3-1.24.6-py3-none-any.whl", hash = "sha256:1c13d555172cf88eb645af2429e4a7f42be85e365d6ffc110c952a556d3f8808"}, {file = "boto3-1.24.6.tar.gz", hash = "sha256:4af6a8bc5110b5f9d2fbd00a3c110e4c4cc36fae78d05afa354831f5789e363b"}, </del> <ins> {file = "boto3-1.24.16-py3-none-any.whl", hash = "sha256:2c6f7e4103d41ca07d6b934a6612e4b9a2666eae36e8289f88726868534b8de2"}, {file = "boto3-1.24.16.tar.gz", hash = "sha256:422c000ff2ee5226e89fe427a9c4c09db095d69c179a3bcc3cfba37cbc5e787e"}, </ins> ] botocore = [ <del> {file = "botocore-1.27.6-py3-none-any.whl", hash = "sha256:eeebe304161db6828413dc358ea80ece52f4ddbc8ecde4dd58978d5861a09293"}, {file = "botocore-1.27.6.tar.gz", hash = "sha256:97c909a6ec5ad421573c18ae67fc6ea4232502cd30cffaf03bfcb584d9df652d"}, </del> <ins> {file = "botocore-1.27.16-py3-none-any.whl", hash = "sha256:f117d59899d21beeb200130d7af2090a8112d702a06e2c2794ef576bcea36773"}, {file = "botocore-1.27.16.tar.gz", hash = "sha256:b3b9710902f675a11f5bfd46afda770150530876ae6541d099584462bf949fd1"}, </ins> ] certifi = [ <del> {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, </del> <ins> {file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"}, {file = "certifi-2022.6.15.tar.gz", hash = "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d"}, </ins> ] cffi = [ {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"},
{file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] jmespath = [ <del> {file = "jmespath-1.0.0-py3-none-any.whl", hash = "sha256:e8dcd576ed616f14ec02eed0005c85973b5890083313860136657e24784e4c04"}, {file = "jmespath-1.0.0.tar.gz", hash = "sha256:a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e"}, </del> <ins> {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, </ins> ] jsonpickle = [ {file = "jsonpickle-2.2.0-py2.py3-none-any.whl", hash = "sha256:de7f2613818aa4f234138ca11243d6359ff83ae528b2185efdd474f62bcf9ae1"},
authors = ["Adam Hoese <adam.hose@tweag.io>"] [tool.poetry.dependencies] <del> python = "^3.8" </del> <ins> python = "^3.9" </ins> nixops = {git = "https://github.com/NixOS/nixops.git"} nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"} nixops-digitalocean = {git = "https://github.com/nix-community/nixops-digitalocean.git"}
<ins> { lib , stdenv , fetchFromGitHub , cmake , makeWrapper , libX11 , libXrandr , linuxPackages }: stdenv.mkDerivation rec { pname = "libvibrant"; version = "2100c09"; src = fetchFromGitHub { owner = "libvibrant"; repo = "libvibrant"; rev = version; hash = "sha256-nVODwP/PQgYBTHnSplgrkdNOLsF7N+vZ8iPL7gArVNY="; }; buildInputs = [ libX11 libXrandr linuxPackages.nvidia_x11.settings.libXNVCtrl ]; nativeBuildInputs = [ cmake makeWrapper ]; meta = with lib; { description = "A simple library to adjust color saturation of X11 outputs"; homepage = "https://github.com/libvibrant/libvibrant"; license = licenses.mit; platforms = platforms.linux; mainProgram = "vibrant-cli"; }; } </ins>
<ins> { lib , stdenv , fetchFromGitHub , qt5 , makeWrapper , libvibrant , libX11 , libXrandr , libxcb , linuxPackages }: stdenv.mkDerivation rec { pname = "vibrantLinux"; version = "2.1.10"; src = fetchFromGitHub { owner = "libvibrant"; repo = "vibrantLinux"; rev = version; hash = "sha256-rvJiVId6221hTrfEIvVO9HTMhaZ6KY44Bu3a5MinPHI="; }; nativeBuildInputs = [ makeWrapper ] ++ (with qt5; [ qmake wrapQtAppsHook ]); buildInputs = [ libX11 libXrandr libxcb libvibrant linuxPackages.nvidia_x11.settings.libXNVCtrl ] ++ (with qt5; [ qtbase qttools ]); postPatch = '' substituteInPlace vibrantLinux.pro  --replace '$$(PREFIX)' '$$PREFIX' ''; meta = with lib; { description = "A tool to automate managing your screen's saturation depending on what programs are running"; homepage = "https://github.com/libvibrant/vibrantLinux"; license = licenses.mit; maintainers = with maintainers; [ unclamped ]; platforms = platforms.linux; mainProgram = "vibrantLinux"; }; } </ins>
owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; <del> sha256 = "sha256-pLxCm+T9jdn0FFqbTFe1tsIPTaVTT+QDeLHDxrbpGBg="; </del> <ins> sha256 = "sha256-WG2lTPpRG9KQpRdb+cS7CqF4ZDV7JZ8XtNqAI6eVzm0="; </ins> }; dontBuild = true;
rustPlatform.buildRustPackage rec { pname = "rustup"; <del> version = "1.24.3"; </del> <ins> version = "1.25.1"; </ins> src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; <del> sha256 = "sha256-JpOOFwlTgwwBCrXOGYskFTgS6RZ7mHQJGT0jnHavxvI="; </del> <ins> sha256 = "sha256-zCr8xu0j/pBsdJEAYTCGrEouA8QumBnyhM4YLFZJqZI="; </ins> }; <del> cargoSha256 = "sha256-hAfGpKaWD94IxFFpnW9XwQp4P9clUX6mmekwodCK0Ag="; </del> <ins> cargoSha256 = "sha256-FDVZn2PjqxovQmmandJICkidurhoXCAxo3bibuxQSMY="; </ins> nativeBuildInputs = [ makeWrapper pkg-config ];
objectClass: organizationalUnit ou: users ''; <ins> ldapClientConfig = { enable = true; loginPam = false; nsswitch = false; server = "ldap://"; base = "dc=example"; }; </ins> testScript = '' machine.wait_for_unit("openldap.service") machine.succeed( <del> 'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"', </del> <ins> 'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword', </ins> ) ''; in {
"CC=${stdenv.cc.targetPrefix}cc" "STRIP="  # Disable install stripping as it breaks cross-compiling. We strip binaries anyway in fixupPhase. "prefix=${placeholder "out"}" <del> "sysconfdir=${placeholder "out"}/etc" </del> <ins> "sysconfdir=/etc" </ins> "systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" # contrib modules require these "moduledir=${placeholder "out"}/lib/modules"
in buildGoModule rec { pname = "minio"; <del> version = "2022-05-08T23-50-31Z"; </del> <ins> version = "2022-07-17T15-43-14Z"; </ins> src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; <del> sha256 = "sha256-Ssuqk/ax6MWdXtbJqWeTTtsIiTK4FmYSR5rOqxh+IaU="; </del> <ins> sha256 = "sha256-hQ52fL4Z3RHthHaJXCkKpbebWpq8MxHo4BziokTuJA4="; </ins> }; <del> vendorSha256 = "sha256-JoI3B3rDzlY0lDHF3rjrzv8/Rq+XCFRs35bWVZqfAKA="; </del> <ins> vendorSha256 = "sha256-u36oHqIxMD3HRio9A3tUt6FO1DtAcQDiC/O54ByeNyg="; </ins> doCheck = false;
<del> { lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: </del> <ins> { lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, wrapGAppsHook, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: </ins> let _version = "2.10.2";
pname = "jameica"; inherit version; <del> nativeBuildInputs = [ ant jdk makeWrapper ]; </del> <ins> nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ]; </ins> buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] ++ lib.optional stdenv.isDarwin Cocoa;
install -Dm644 plugin.xml $out/share/java/ install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png cp ${desktopItem}/share/applications/* $out/share/applications/ <ins> ''; postFixup = '' </ins> makeWrapper ${jre}/bin/java $out/bin/jameica  --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${ lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main"  --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)}  <del> --chdir "$out/share/java/" </del> <ins> --chdir "$out/share/java/"  "''${gappsWrapperArgs[@]}" </ins> ''; meta = with lib; {
stdenv.mkDerivation rec { pname = "tutanota-desktop"; <del> version = "3.95.4"; </del> <ins> version = "3.98.15"; </ins> src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; <del> sha256 = "0kkkp0nw4fby4663w7g0k2y1sg89pm336slzii1s3n70h8cak3dx"; </del> <ins> sha256 = "sha256-yuSFDLQ7ckuZYuXREbW0VvMapzO2VhVIH1Ccr1uQHmo="; </ins> }; nativeBuildInputs = [
{ lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; <del> version = "5.11.0"; name = "${pname}-${version}"; </del> <ins> version = "5.12.1"; </ins> src = fetchurl { <del> name = "${name}.AppImage"; </del> <ins> name = "${pname}-${version}.AppImage"; </ins> url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; <del> hash = "sha256-Nj6S53b4w84qppkGB7lMpJhJlxifaD4acPryuZxY7cM="; </del> <ins> hash = "sha256-ugnJcSFgEEPJ9qxqmRGgW1fraE4E/HbbxpK/00TXPmw="; </ins> }; udevRules = fetchurl {
hash = "sha256-OZe5dV50xq99olImbo7JQxPjRd7hGyBIVwFvtR9cIVc="; }; <del> appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: { </del> <ins> appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: { </ins> buildCommand = '' ${oA.buildCommand}
extraInstallCommands = '' # Add desktop convencience stuff <del> mv $out/bin/{${name},${pname}} </del> <ins> mv $out/bin/{${pname}-*,${pname}} </ins> install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps substituteInPlace $out/share/applications/flexoptix-app.desktop
hash = "sha256-pqj1LwRdOK2CUu3hYIsogQIXxWzShDuKEbDTbtWkgnQ="; }; <ins> patches = lib.optionals stdenv.isDarwin [ # https://github.com/libproxy/libproxy/pull/189 (fetchpatch { url = "https://github.com/libproxy/libproxy/commit/4331b9db427ce2c25ff5eeb597bec4bc35ed1a0b.patch"; sha256 = "sha256-uTh3rYVvEke1iWVHsT3Zj2H1F+gyLrffcmyt0JEKaCA="; }) ]; </ins> outputs = [ "out" "dev" "py3" ]; nativeBuildInputs = [
<del> { lib, buildGoModule, fetchFromGitHub, installShellFiles, git, testers, git-town, makeWrapper }: </del> <ins> { lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, git, testers, git-town, makeWrapper }: </ins> buildGoModule rec { pname = "git-town"; <del> version = "7.7.0"; </del> <ins> version = "7.8.0"; </ins> src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; <del> sha256 = "sha256-FpBEBx2gb33fGDndvZmvG1A61NoJ4Qy4V3YQSb+Ugsc="; </del> <ins> sha256 = "sha256-g9ooMIMN8DN2FcWYkDC1hICCleQYdHf30PYMCit/NMI="; </ins> }; <ins> patches = [ # Fix "go vet" when building using Go 1.18. (fetchpatch { name = "fix-go-vet-in-go-1.18.patch"; url = "https://github.com/git-town/git-town/commit/23eb0aca7b28c6a0afc21db553aa0e35d35891aa.patch"; sha256 = "sha256-EyfhKVrQxRJNrYqaZI04dJogaXs1J+bbOIu7p8g2Clc="; }) ]; </ins> vendorSha256 = null; nativeBuildInputs = [ installShellFiles makeWrapper ];
outputs = [ "out" "udev" ]; <del> nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; buildInputs = [ libappindicator librsvg ]; </del> <ins> nativeBuildInputs = [ gdk-pixbuf gobject-introspection wrapGAppsHook ]; buildInputs = [ libappindicator librsvg ]; </ins> propagatedBuildInputs = with python3Packages; [ evdev <del> gobject-introspection </del> gtk3 psutil pygobject3
install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules ''; <ins> dontWrapGApps = true; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; # no tests doCheck = false; pythonImportsCheck = [ "solaar" ]; </ins> meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = ''
MOUSE_PS2_VMMOUSE  = yes; MTRR_SANITIZER     = yes; NET_FC             = yes; # Fibre Channel driver support <ins> # Needed for touchpads to work on some AMD laptops PINCTRL_AMD        = whenAtLeast "5.19" yes; </ins> # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks PINCTRL_BAYTRAIL   = yes; # GPIO for Braswell and Cherryview devices
<xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md  --> <xi:include href="java.xml" /> <xi:include href="lua.xml" /> <ins> <xi:include href="node.xml" /> <!-- generated from ../../pkgs/development/node-packages/README.md  --> </ins> <xi:include href="perl.xml" /> <xi:include href="python.xml" /> <xi:include href="qt.xml" />
<del> NPM packages =========== </del> <ins> Node.js packages =============== To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: </ins> 1. Install node2nix: `nix-env -f '<nixpkgs>' -iA node2nix`. 2. Modify `pkgs/development/node-packages/node-packages.json`, to add, update, or remove package entries.
<del> { lib, stdenv, fetchFromGitHub, cmake, darwin, python3 }: </del> <ins> { lib, stdenv, fetchFromGitHub, cmake, python3, autoSignDarwinBinariesHook, cctools }: </ins> # Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use # the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from # https://github.com/google/shaderc/blob/known-good/known_good.json
rev = "0c28b6451d77774912e52949c1e57fa726edf113"; sha256 = "sha256-KpCMceTV/BRaoJe1qeXhKYQNQqdGaM6Q9nklpJKzHFY="; }; <del> in stdenv.mkDerivation rec { </del> <ins> in stdenv.mkDerivation rec { </ins> pname = "shaderc"; version = "2021.0";
ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; <del> nativeBuildInputs = [ cmake python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; </del> <ins> nativeBuildInputs = [ cmake python3 ] ++ lib.optionals stdenv.isDarwin [ cctools ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; </ins> postInstall = '' moveToOutput "lib/*.a" $static
session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { }; <del> shaderc = callPackage ../development/compilers/shaderc { }; </del> <ins> shaderc = callPackage ../development/compilers/shaderc { inherit (darwin) autoSignDarwinBinariesHook cctools; }; </ins> shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; <del> buildInputs = [ fftw ]; </del> <ins> buildInputs = lib.optionals withFftw3 [ fftw ]; </ins> <del> configureFlags = [ "--with-fft=gpl-fftw3" ] ++ lib.optional stdenv.isAarch64 "--disable-neon"; </del> <ins> configureFlags = lib.optionals withFftw3 [ "--with-fft=gpl-fftw3" ] ++ lib.optional stdenv.isAarch64 "--disable-neon"; </ins> meta = with lib; { homepage = "https://www.speex.org/";
libcardiacarrest = callPackage ../misc/libcardiacarrest { }; <del> easyeffects = callPackage ../applications/audio/easyeffects { }; </del> <ins> easyeffects = callPackage ../applications/audio/easyeffects { # Fix crashes with speexdsp effects speexdsp = speexdsp.override { withFftw3 = false; }; }; </ins> pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { };
installPhase = '' install -D powerlevel10k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k <ins> install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k </ins> install -D config/* --target-directory=$out/share/zsh-powerlevel10k/config install -D internal/* --target-directory=$out/share/zsh-powerlevel10k/internal cp -R gitstatus $out/share/zsh-powerlevel10k/gitstatus
let buildFHSEnv = callPackage ./env.nix { }; in <del> args@{ name, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: </del> <ins> args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: </ins> let <del> env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" "passthru" ]); </del> <ins> env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]); </ins> <del> # Sandboxing script chroot-user = writeScript "chroot-user" '' #! ${ruby}/bin/ruby ${builtins.readFile ./chroot-user.rb} ''; </del> <ins> chrootenv = stdenv.mkDerivation { name = "chrootenv"; unpackPhase = "cp ${./chrootenv.c} chrootenv.c"; installPhase = "cp chrootenv $out"; makeFlags = [ "chrootenv" ]; }; </ins> init = run: writeScript "${name}-init" '' #! ${stdenv.shell}
passthru = passthru // { env = runCommand "${name}-shell-env" { shellHook = '' <del> ${lib.optionalString (extraBindMounts != []) ''export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"''} exec ${chroot-user} ${init "bash"} "$(pwd)" </del> <ins> exec ${chrootenv} ${init "bash"} "$(pwd)" </ins> ''; } '' echo >&2 ""
mkdir -p $out/bin cat <<EOF >$out/bin/${name} #! ${stdenv.shell} <del> ${lib.optionalString (extraBindMounts != []) ''export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"''} exec ${chroot-user} ${init runScript} "$(pwd)" "$@" </del> <ins> exec ${chrootenv} ${init runScript} "$(pwd)" "$@" </ins> EOF chmod +x $out/bin/${name} ${extraInstallCommands}
<ins> diff --git a/go.mod b/go.mod index 660463a..5249458 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/rs/curlie require ( golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3 -	golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 +	golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 ) go 1.13 </ins>
hash = "sha256-3EKxuEpFm+lp2myMfymYYY9boSXGOF2iAdjtGKnjJK0="; }; <del> vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; </del> <ins> patches = [ ./bump-golang-x-sys.patch ]; vendorSha256 = "sha256-VsPdMUfS4UVem6uJgFISfFHQEKtIumDQktHQFPC1muc="; </ins> ldflags = [ "-s" "-w" "-X main.version=${version}" ];
, gtk3, glib, glib-networking, gsettings-desktop-schemas , gnome-desktop, gnome-settings-daemon, gnome-online-accounts , vino, gnome-bluetooth, tracker, adwaita-icon-theme <del> , udisks2, gsound, libhandy, cups }: </del> <ins> , udisks2, gsound, libhandy, cups, mutter }: </ins> stdenv.mkDerivation rec { pname = "gnome-control-center";
# Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" <ins> # WM keyboard shortcuts --prefix XDG_DATA_DIRS : "${mutter}/share" </ins> ) for i in $out/share/applications/*; do substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center"
{ lib, stdenv, fetchFromGitHub , pkg-config, cmake, ninja, yasm <del> , libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf </del> <ins> , libjpeg, openssl_1_1, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf </ins> , openh264, usrsctp, libevent, libvpx , libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ <del> libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf </del> <ins> libjpeg libopus ffmpeg alsa-lib libpulseaudio protobuf </ins> openh264 usrsctp libevent libvpx libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire
]; # test_peer_interface hits a timeout <ins> # test_tcp_connection_with_forwarding fails due to dbus # creating unix socket anyway on v1.14.4 </ins> checkPhase = '' dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf  ${python.interpreter} -m pytest -sv --cov=dbus_next  <del> -k "not test_peer_interface" </del> <ins> -k "not test_peer_interface and not test_tcp_connection_with_forwarding" </ins> ''; meta = with lib; {
</listitem> <listitem> <para> <ins> <literal>services.mastodon</literal> gained a tootctl wrapped named <literal>mastodon-tootctl</literal> similar to <literal>nextcloud-occ</literal> which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables. </para> </listitem> <listitem> <para> </ins> A new <literal>virtualisation.rosetta</literal> module was added to allow running <literal>x86_64</literal> binaries through
- The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules) <ins> - `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables. </ins> - A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm).
] else [] ) env)))); <del> mastodonEnv = pkgs.writeShellScriptBin "mastodon-env" '' </del> <ins> mastodonTootctl = pkgs.writeShellScriptBin "mastodon-tootctl" '' #! ${pkgs.runtimeShell} </ins> set -a export RAILS_ROOT="${cfg.package}" source "${envFile}" source /var/lib/mastodon/.secrets_env <del> eval -- "$@" </del> <ins> sudo=exec if [[ "$USER" != ${cfg.user} ]]; then sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env' fi $sudo ${cfg.package}/bin/tootctl "$@" </ins> ''; in {
description = lib.mdDoc '' User under which mastodon runs. If it is set to "mastodon", that user will be created, otherwise it should be set to the <del> name of a user created elsewhere.  In both cases, `mastodon` and a package containing only the shell script `mastodon-env` will be added to the user's package set. To run a command from `mastodon` such as `tootctl` with the environment configured by this module use `mastodon-env`, as in: `mastodon-env tootctl accounts create newuser --email newuser@example.com` </del> <ins> name of a user created elsewhere. In both cases, the `mastodon` package will be added to the user's package set and a tootctl wrapper to system packages that switches to the configured account and load the right environment. </ins> ''; type = lib.types.str; default = "mastodon";
inherit (cfg) group; }; }) <del> (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package mastodonEnv pkgs.imagemagick ]) </del> <ins> (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package pkgs.imagemagick ]) </ins> ]; users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user;