<del> diff --git a/Cargo.lock b/Cargo.lock index fb17c7e..ef157e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2332,10 +2332,10 @@ dependencies = [ [[package]] name = "magnum-opus" version = "0.4.0" -source = "git+https://github.com/open-trade/magnum-opus#3c3d0b86ae95c84930bebffe4bcb03b3bd83342b" +source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604" dependencies = [ - "bindgen", - "target_build_utils", + "libc", + "opusic-sys", ] [[package]] @@ -2796,6 +2796,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "opusic-sys" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eace752ce07a037241dba8f02c654799f051e431b27028056bcb480e83b54f5" +dependencies = [ + "cmake", + "libc", +] + [[package]] name = "os_str_bytes" version = "6.0.0" </del> diff --git a/Cargo.toml b/Cargo.toml index 1b715bd..960e8da 100644 --- a/Cargo.toml


{ lib <del> , stdenv </del> , fetchFromGitHub , makeDesktopItem , copyDesktopItems


, cmake , yasm , nasm <del> , zip </del> , pkg-config , clang , gtk3


./fix-for-rust-1.65.diff ]; <del> cargoSha256 = "sha256-1OMWEk+DerltF7kwdo4d04rbgIFLHBRq3vZaL7jtrdE="; LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; </del> <ins> LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "confy-0.4.0" = "sha256-e91cvEixhpPzIthAxzTa3fDY6eCsHUy/eZQAqs7QTDo="; "parity-tokio-ipc-0.7.3-1" = "sha256-eULJePtBu0iBI3It/bPH0h82Obsb1PJALgwYwrnCFYI="; "rdev-0.5.0-2" = "sha256-7CEZ2wIM4QAPfY1tGKqXfHplTaxHnccVqFRPjY21Svo="; "tokio-socks-0.5.1-1" = "sha256-45QQ6FrhGU9uEhbKXTKd/mY6MDumO6p46NmlakdyDQk="; "libappindicator-0.6.1" = "sha256-JGnnZrcwbh8WJ6+/4bYhfD3HvgF2C7XaaGb6TaMRWdw="; "magnum-opus-0.4.0" = "sha256-U5uuN4YolOYDnFNbtPpwYefcBDTUUyioui0UCcW8dyo="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; "sciter-rs-0.5.57" = "sha256-ZZnZDhMjK0LjgmK0da1yvB0uoKueLhhhQtzmjoN+1R0="; "systray-0.4.1" = "sha256-p1PMr/8oS6zHx4+Ng4zCqt0xZ57cq3wAu6/agyWq5Jw="; }; }; </ins> # Change magnus-opus version to upstream so that it does not use # vcpkg for libopus since it does not work.


# Manually simulate a vcpkg installation so that it can link the libaries # properly. <del> postUnpack = let vcpkg_target = "x64-linux"; updates_vcpkg_file = writeText "update_vcpkg_rustdesk" </del> <ins> postUnpack = let vcpkg_target = "x64-linux"; updates_vcpkg_file = writeText "update_vcpkg_rustdesk" '' Package : libyuv Architecture : ${vcpkg_target} Version : 1.0 Status : is installed Package : libvpx Architecture : ${vcpkg_target} Version : 1.0 Status : is installed ''; in </ins> '' <del> Package : libyuv Architecture : ${vcpkg_target} Version : 1.0 Status : is installed Package : libvpx Architecture : ${vcpkg_target} Version : 1.0 Status : is installed </del> <ins> export VCPKG_ROOT="$TMP/vcpkg"; mkdir -p $VCPKG_ROOT/.vcpkg-root mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib mkdir -p $VCPKG_ROOT/installed/vcpkg/updates ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status mkdir -p $VCPKG_ROOT/installed/vcpkg/info touch $VCPKG_ROOT/installed/vcpkg/info/libyuv_1.0_${vcpkg_target}.list touch $VCPKG_ROOT/installed/vcpkg/info/libvpx_1.0_${vcpkg_target}.list ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ </ins> ''; <del> in '' export VCPKG_ROOT="$TMP/vcpkg"; mkdir -p $VCPKG_ROOT/.vcpkg-root mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib mkdir -p $VCPKG_ROOT/installed/vcpkg/updates ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status mkdir -p $VCPKG_ROOT/installed/vcpkg/info touch $VCPKG_ROOT/installed/vcpkg/info/libyuv_1.0_${vcpkg_target}.list touch $VCPKG_ROOT/installed/vcpkg/info/libvpx_1.0_${vcpkg_target}.list ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ ''; </del> nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook ]; buildInputs = [ alsa-lib pulseaudio libXfixes libxcb xdotool gtk3 libvpx libopus libXtst libyuv ];


# Checks require an active X display. doCheck = false; <del> desktopItems = [ (makeDesktopItem { name = "rustdesk"; exec = meta.mainProgram; icon = "rustdesk"; desktopName = "RustDesk"; comment = meta.description; genericName = "Remote Desktop"; categories = ["Network"]; }) ]; </del> <ins> desktopItems = [ (makeDesktopItem { name = "rustdesk"; exec = meta.mainProgram; icon = "rustdesk"; desktopName = "RustDesk"; comment = meta.description; genericName = "Remote Desktop"; categories = [ "Network" ]; }) ]; postPatch = '' rm Cargo.lock ln -s ${./Cargo.lock} Cargo.lock ''; </ins> # Add static ui resources and libsciter to same folder as binary so that it # can find them.


description = "Yet another remote desktop software"; homepage = "https://rustdesk.com"; license = licenses.gpl3Only; <del> maintainers = with maintainers; [ leixb ]; </del> <ins> maintainers = with maintainers; [ ocfox leixb ]; </ins> platforms = [ "x86_64-linux" ]; mainProgram = "rustdesk"; };


<del> { lib, buildPythonPackage, fetchFromGitHub , django }: </del> <ins> { lib , buildPythonPackage , django , fetchFromGitHub , poetry-core , python , pythonOlder , ua-parser }: </ins> buildPythonPackage rec { pname = "django-sesame"; <del> version = "1.7"; </del> <ins> version = "3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; </ins> src = fetchFromGitHub { owner = "aaugustin"; repo = pname; <del> rev = version; sha256 = "0k8s44zn2jmasp0w064vrx685fn4pbmdfx8qmhkab1hd5ys6pi44"; </del> <ins> rev = "refs/tags/${version}"; hash = "sha256-Pyyhm0th0cNEkM0sd6maCnf4qELsSO82c9CQuqQdn0w="; </ins> }; <del> nativeCheckInputs = [ django ]; </del> <ins> nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ django ua-parser ]; pythonImportsCheck = [ "sesame" ]; </ins> checkPhase = '' <del> make test </del> <ins> runHook preCheck ${python.interpreter} -m django test --settings=tests.settings runHook postCheck </ins> ''; meta = with lib; {


, writeShellScriptBin , runtimeShell , installShellFiles <ins> , bc </ins> , ncurses , perl , glibcLocales


# Include first args to make sure we're patching the right thing substituteInPlace shell/key-bindings.bash  --replace " perl -n " " ${ourPerl}/bin/perl -n " <ins> # fzf-tmux depends on bc substituteInPlace bin/fzf-tmux  --replace "bc" "${bc}/bin/bc" </ins> ''; postInstall = ''


{ appimageTools , fetchurl , lib <del> , xorg , udev , wooting-udev-rules </del> , makeWrapper }: <del> appimageTools.wrapType2 rec { </del> <ins> let </ins> pname = "wootility"; version = "4.6.20"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage"; sha256 = "sha256-JodmF3TThPpXXx1eOnYmYAJ4x5Ylcf35bw3R++5/Buk="; }; <ins> in appimageTools.wrapType2 { inherit pname version src; </ins> extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; };


export LC_ALL=C.UTF-8 ''; <del> multiPkgs = extraPkgs; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ udev wooting-udev-rules xorg.libxkbfile ]); </del> <ins> extraPkgs = pkgs: with pkgs; ([ xorg.libxkbfile ]); </ins> <del> meta = with lib; { </del> <ins> meta = { </ins> homepage = "https://wooting.io/wootility"; description = "Customization and management software for Wooting keyboards"; <del> platforms = [ "x86_64-linux" ]; license = licenses.unfree; maintainers = with maintainers; [ davidtwco sodiboo ]; </del> <ins> platforms = lib.platforms.linux; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ davidtwco sodiboo ]; </ins> mainProgram = "wootility"; }; }


<ins> { lib , appimageTools , fetchurl }: let pname = "codux"; version = "15.4.4"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; sha256 = "sha256-6XLKXw+e/310mCQxM/X/kzok562vGjEhmF1eLfakB4Q="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share substituteInPlace $out/share/applications/${pname}.desktop  --replace 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { description = "A visual IDE for React"; homepage = "https://www.codux.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ dit7ya ]; }; } </ins>


codespell = callPackage ../development/tools/codespell { }; <ins> codux = callPackage ../applications/editors/codux { }; </ins> coolreader = libsForQt5.callPackage ../applications/misc/coolreader { }; corsair = with python3Packages; toPythonApplication corsair-scan;


<del> { stdenv, fetchurl, utillinux, libcap }: </del> <ins> { stdenv, fetchurl, fetchpatch, getopt, libcap }: </ins> stdenv.mkDerivation rec { version = "1.20.2";


sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw"; }; <del> buildInputs = [ utillinux /* provides getopt */ libcap ]; </del> <ins> # patchset from brew patches = stdenv.lib.optionals stdenv.isDarwin [ (fetchpatch { name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649"; sha256 = "1m6ggrqwqy0in264sxqk912vniipiw629dxq7kibakvsswfk6bkk"; }) (fetchpatch { name = "0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch;att=2;bug=766649"; sha256 = "0rhayp42x4i1a6yc4d28kpshmf7lrmaprq64zfrjpdn4kbs0rkln"; }) (fetchpatch { name = "fakeroot-always-pass-mode.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20"; sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p"; }) ]; buildInputs = [ getopt ] ++ stdenv.lib.optional (!stdenv.isDarwin) libcap ; </ins> postUnpack = '' for prog in getopt; do


description = "Give a fake root environment through LD_PRELOAD"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; <del> platforms = with stdenv.lib.platforms; linux; </del> <ins> platforms = stdenv.lib.platforms.unix; </ins> }; }


--replace "etc" "$out/etc" substituteInPlace ./src/scripts/wihotspot  --replace "/usr" "$out" <ins> substituteInPlace ./src/desktop/wifihotspot.desktop  --replace "/usr" "$out" substituteInPlace ./src/scripts/policies/polkit.policy  --replace "/usr" "$out" </ins> ''; makeFlags = [


# Required by Budgie Menu. gnome-menus <ins> # Required by Budgie Control Center. gnome.zenity </ins> # Provides `gsettings`. glib


stdenv.mkDerivation rec { pname = "budgie-desktop"; <del> version = "10.7.1"; </del> <ins> version = "10.7.2"; </ins> src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = pname; rev = "v${version}"; fetchSubmodules = true; <del> sha256 = "sha256-ww65J9plixbxFza6xCfaz1WYtT9giKkLVH1XYxH41+0="; </del> <ins> hash = "sha256-fd3B2DMZxCI4Gb9mwdACjIPydKghXx8IkhFpMS/Clps="; </ins> }; patches = [


gnome.gnome-bluetooth_1_0 gnome.gnome-settings-daemon gnome.mutter <ins> gnome.zenity </ins> graphene gtk3 ibus


source 'https://rubygems.org' gem 'jekyll' <ins> gem 'jekyll-feed' </ins> gem 'jekyll-paginate' gem 'rdiscount' gem 'RedCloth' <ins> gem 'minima' </ins>


GEM remote: https://rubygems.org/ specs: <del> RedCloth (4.2.9) colorator (0.1) ffi (1.9.10) jekyll (3.0.1) colorator (~> 0.1) </del> <ins> RedCloth (4.3.2) addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) colorator (1.1.0) ffi (1.9.18) forwardable-extended (2.6.0) jekyll (3.4.1) addressable (~> 2.4) colorator (~> 1.0) </ins> jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) liquid (~> 3.0) mercenary (~> 0.3.3) <ins> pathutil (~> 0.9) </ins> rouge (~> 1.7) safe_yaml (~> 1.0) <del> jekyll-sass-converter (1.4.0) sass (~> 3.4) jekyll-watch (1.3.0) listen (~> 3.0) </del> <ins> jekyll-feed (0.9.1) jekyll (~> 3.3) </ins> jekyll-paginate (1.1.0) <del> kramdown (1.9.0) </del> <ins> jekyll-sass-converter (1.5.0) sass (~> 3.4) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) kramdown (1.13.2) </ins> liquid (3.0.6) <del> listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) mercenary (0.3.5) rb-fsevent (0.9.7) rb-inotify (0.9.5) </del> <ins> listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) minima (2.1.0) jekyll (~> 3.3) pathutil (0.14.0) forwardable-extended (~> 2.6) public_suffix (2.0.5) rb-fsevent (0.9.8) rb-inotify (0.9.8) </ins> ffi (>= 0.5.0) <del> rdiscount (2.1.8) rouge (1.10.1) </del> <ins> rdiscount (2.2.0.1) rouge (1.11.1) </ins> safe_yaml (1.0.4) <del> sass (3.4.20) </del> <ins> sass (3.4.23) </ins> PLATFORMS ruby


DEPENDENCIES RedCloth jekyll <ins> jekyll-feed jekyll-paginate minima </ins> rdiscount BUNDLED WITH <del> 1.10.6 </del> <ins> 1.14.4 </ins>


<del> { stdenv, lib, bundlerEnv, ruby_2_2, curl }: </del> <ins> { stdenv, lib, bundlerEnv, ruby }: </ins> bundlerEnv rec { name = "jekyll-${version}"; <del> version = "3.0.1"; ruby = ruby_2_2; gemdir = ./.; </del> <ins> version = (import gemset).jekyll.version; inherit ruby; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; </ins> meta = with lib; { description = "Simple, blog aware, static site generator";


{ <del> "RedCloth" = { version = "4.2.9"; </del> <ins> addressable = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; </ins> type = "gem"; <del> sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl"; </del> }; <ins> version = "2.5.0"; </ins> }; <del> "colorator" = { version = "0.1"; </del> <ins> colorator = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72"; </ins> type = "gem"; <del> sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs"; </del> }; <ins> version = "1.1.0"; </ins> }; <del> "ffi" = { version = "1.9.10"; </del> <ins> ffi = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; </ins> type = "gem"; <del> sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; </del> }; <ins> version = "1.9.18"; </ins> }; <del> "jekyll" = { version = "3.0.1"; </del> <ins> forwardable-extended = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v"; </ins> type = "gem"; <del> sha256 = "107svn6r7pvkg9wwfi4r44d2rqppysjf9zf09h7z1ajsy8k2s65a"; </del> }; <del> dependencies = [ "colorator" "jekyll-sass-converter" "jekyll-watch" "jekyll-paginate" "kramdown" "liquid" "mercenary" "rouge" "safe_yaml" ]; </del> <ins> version = "2.6.0"; </ins> }; <del> "jekyll-sass-converter" = { version = "1.4.0"; </del> <ins> jekyll = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "0qbnjx7bpshbcam6p9ss2g6gpd3gxz6h4w9yszphj3ip335yhawb"; </ins> type = "gem"; <del> sha256 = "095757w0pg6qh3wlfg1j1mw4fsz7s89ia4zai5f2rhx9yxsvk1d8"; </del> }; <del> dependencies = [ "sass" ]; </del> <ins> version = "3.4.1"; </ins> }; <del> "jekyll-watch" = { version = "1.3.0"; </del> <ins> jekyll-feed = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "1dj62gy1jskkn703mi5h0bkg1psbpkdm2qqdw3bhjfid9358qvay"; </ins> type = "gem"; <del> sha256 = "1mqwvrd2hm6ah5zsxqsv2xdp31wl94pl8ybb1q324j79z8pvyarg"; </del> }; <del> dependencies = [ "listen" ]; </del> <ins> version = "0.9.1"; </ins> }; <del> "jekyll-paginate" = { </del> <ins> jekyll-paginate = { source = { sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; type = "gem"; }; </ins> version = "1.1.0"; <ins> }; jekyll-sass-converter = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "01m921763yfgx1gc33k5ixqz623f4c4azgnpqhgsc2q61fyfk3q1"; </ins> type = "gem"; <del> sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; </del> }; <ins> version = "1.5.0"; </ins> }; <del> "kramdown" = { version = "1.9.0"; </del> <ins> jekyll-watch = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "02rg3wi95w2l0bg1igl5k6pza723vn2b2gj975gycz1cpmhdjn6z"; </ins> type = "gem"; <del> sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0"; </del> }; <ins> version = "1.5.0"; </ins> }; <del> "liquid" = { version = "3.0.6"; </del> <ins> kramdown = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "1isiqc40q44zg57bd6cfnw1a2l0s2j5skw2awn2cz3gcm7wsf49d"; </ins> type = "gem"; <ins> }; version = "1.13.2"; }; liquid = { source = { </ins> sha256 = "033png37ym4jrjz5bi7zb4ic4yxacwvnllm1xxmrnr4swgyyygc2"; <ins> type = "gem"; </ins> }; <ins> version = "3.0.6"; </ins> }; <del> "listen" = { version = "3.0.5"; </del> <ins> listen = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i"; </ins> type = "gem"; <del> sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g"; </del> }; <del> dependencies = [ "rb-fsevent" "rb-inotify" ]; </del> <ins> version = "3.0.8"; </ins> }; <del> "mercenary" = { version = "0.3.5"; </del> <ins> mercenary = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; </ins> type = "gem"; <del> sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb"; </del> }; <ins> version = "0.3.6"; </ins> }; <del> "rb-fsevent" = { version = "0.9.7"; </del> <ins> minima = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "1s7ks9fqfvqx7qicnkrg76wavg9mjas52f7iyhr89lz9mqiy7p39"; </ins> type = "gem"; <del> sha256 = "1xlkflgxngwkd4nyybccgd1japrba4v3kwnp00alikj404clqx4v"; </del> }; <ins> version = "2.1.0"; </ins> }; <del> "rb-inotify" = { version = "0.9.5"; </del> <ins> pathutil = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "0f444wx6vjd30lkkb2zn1k5a6g33lidrpyy7lmgy66n1gsiipzn7"; </ins> type = "gem"; <del> sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; </del> }; <del> dependencies = [ "ffi" ]; </del> <ins> version = "0.14.0"; </ins> }; <del> "rdiscount" = { version = "2.1.8"; </del> <ins> public_suffix = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; </ins> type = "gem"; <del> sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; </del> }; <ins> version = "2.0.5"; </ins> }; <del> "rouge" = { version = "1.10.1"; </del> <ins> rb-fsevent = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "1pdiasp9zlr306yld19szapi6kdjk38rpv1hih9x0ry40x6mb63n"; </ins> type = "gem"; <del> sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz"; </del> }; <ins> version = "0.9.8"; </ins> }; <del> "safe_yaml" = { version = "1.0.4"; </del> <ins> rb-inotify = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "0bq14f3md5nm00kgxgf0r9lcbn0vgbwljgajif0slxcwv622fjg9"; </ins> type = "gem"; <ins> }; version = "0.9.8"; }; rdiscount = { source = { remotes = ["https://rubygems.org"]; sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; type = "gem"; }; version = "2.2.0.1"; }; RedCloth = { source = { remotes = ["https://rubygems.org"]; sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy"; type = "gem"; }; version = "4.3.2"; }; rouge = { source = { remotes = ["https://rubygems.org"]; sha256 = "13amckbdknnc5491ag28y8pqbyfpbzx5n4rlmadxhd3wkrhp92c8"; type = "gem"; }; version = "1.11.1"; }; safe_yaml = { source = { </ins> sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; <ins> type = "gem"; </ins> }; <ins> version = "1.0.4"; </ins> }; <del> "sass" = { version = "3.4.20"; </del> <ins> sass = { </ins> source = { <ins> remotes = ["https://rubygems.org"]; sha256 = "0da4mn3n60cm1ss1pw1rrpa7fxagglxiwcgvz1asf1qgf4mvcwyr"; </ins> type = "gem"; <del> sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf"; </del> }; <ins> version = "3.4.23"; </ins> }; <del> } </del> <ins> } </ins>  No newline at end of file


[ darwin.apple_sdk.frameworks.CoreServices ]; }; <ins> # disable bundle install as it can't install anything in addition to what is # specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R # to compensate for read-only files in site_template in nix store. jekyll = attrs: { postInstall = '' installPath=$(cat $out/nix-support/gem-meta/install-path) sed -i $installPath/lib/jekyll/commands/new.rb  -e 's@Exec.run("bundle", "install"@Exec.run("true"@'  -e 's@FileUtils.cp_r site_template + "/.", path@FileUtils.cp_r site_template + "/.", path; FileUtils.chmod_R "u+w", path@' ''; }; </ins> # note that you need version >= v3.16.14.8, # otherwise the gem will fail to link to the libv8 binary. # see: https://github.com/cowboyd/libv8/pull/161


{ stdenv , lib , fetchurl <ins> , fetchpatch </ins> , asciidoc , docbook-xsl-nons , docbook_xml_dtd_45


stdenv.mkDerivation rec { pname = "tracker-miners"; <del> version = "3.5.0"; </del> <ins> version = "3.5.2"; </ins> src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; <del> sha256 = "F5ZmA9xDKphSa0kFhqSKzX+fWZNfeJXfxRcppGppAaM="; </del> <ins> sha256 = "QPuR+svZRo4m6+zHEdg2Mc2K6TkcYV1o27A8vKsbbGk="; </ins> }; <ins> patches = [ # Use cc.has_header_symbol to check for BTRFS_IOC_INO_LOOKUP # https://github.com/NixOS/nixpkgs/issues/228639 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/c08fbe0650d4a2ae915a21764f54c02eda9406d5.patch"; sha256 = "U81+yfg2sUkKl4tKMeB7pXJRNSeIE+2loT3/bvnhoKM="; }) ]; </ins> nativeBuildInputs = [ asciidoc docbook-xsl-nons


buildGoModule rec { pname = "symfony-cli"; <del> version = "5.5.6"; vendorHash = "sha256-AfgDsd4W8wV0GeymD9SLeHtOeFP9qbFy+GTdMxQSkDA="; </del> <ins> version = "5.5.7"; vendorHash = "sha256-OXV/hTSHJvYfe2SiFamkedC01J/DOgd8I60yIpQToos="; </ins> src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; <del> sha256 = "sha256-lE8RBjBXucL0DJjEnBLbHqOVE6g358rwmaEUqU6QhOw="; </del> <ins> hash = "sha256-LC6QQIVHllBRu8B6XfV8SuTB3O+FmqYr+LQnVmLj2nU="; </ins> }; ldflags = [


$GOPATH/bin/symfony-cli ''; <del> meta = with lib; { </del> <ins> meta = { </ins> description = "Symfony CLI"; homepage = "https://github.com/symfony-cli/symfony-cli"; <del> license = licenses.agpl3Plus; maintainers = with maintainers; [ drupol ]; </del> <ins> license = lib.licenses.agpl3Plus; </ins> mainProgram = "symfony"; <ins> maintainers = with lib.maintainers; [ drupol ]; </ins> }; }


<del> { lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }: </del> <ins> { lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk, testers, transcrypt }: </ins> stdenv.mkDerivation rec { pname = "transcrypt"; <del> version = "1.1.0"; </del> <ins> version = "2.2.3"; </ins> src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; <del> sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam"; </del> <ins> sha256 = "+B8CYHDneDd0GwiTwQK6YVScDMKao2JXFpGk9PY6/EE="; </ins> }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ git openssl coreutils util-linux gnugrep gnused gawk ]; <del> patches = [ ./helper-scripts_depspathprefix.patch ]; </del> installPhase = '' install -m 755 -D transcrypt $out/bin/transcrypt install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1


chmod +x $out/bin/transcrypt-depspathprefix ''; <ins> passthru.tests.version = testers.testVersion { package = transcrypt; command = "transcrypt --version"; version = "transcrypt ${version}"; }; </ins> meta = with lib; { description = "Transparently encrypt files within a Git repository"; longDescription = ''


<del> diff --git a/transcrypt b/transcrypt index a0b562d..7888f5d 100755 --- a/transcrypt +++ b/transcrypt @@ -278,6 +278,7 @@ save_helper_scripts() { cat <<-'EOF' > "${GIT_DIR}/crypt/clean" #!/usr/bin/env bash +		PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" filename=$1 # ignore empty files if [[ -s $filename ]]; then @@ -300,6 +301,7 @@ save_helper_scripts() { cat <<-'EOF' > "${GIT_DIR}/crypt/smudge" #!/usr/bin/env bash +		PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" tempfile=$(mktemp 2> /dev/null || mktemp -t tmp) trap 'rm -f "$tempfile"' EXIT cipher=$(git config --get --local transcrypt.cipher) @@ -309,6 +311,7 @@ save_helper_scripts() { cat <<-'EOF' > "${GIT_DIR}/crypt/textconv" #!/usr/bin/env bash +		PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" filename=$1 # ignore empty files if [[ -s $filename ]]; then @@ -351,7 +354,7 @@ save_configuration() { git config merge.renormalize 'true' # add a git alias for listing encrypted files -	git config alias.ls-crypt "!git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = ":" }; /crypt$/{ print $1 }'" +	git config alias.ls-crypt "!PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"; git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = ":" }; /crypt$/{ print $1 }'" } # display the current configuration settings </del>


<ins> { blueprint-compiler , desktop-file-utils , fetchFromGitHub , lib , libadwaita , libportal-gtk4 , meson , ninja , python3Packages , wrapGAppsHook4 }: python3Packages.buildPythonApplication rec { pname = "adwsteamgtk"; version = "0.6.9"; # built with meson, not a python format format = "other"; src = fetchFromGitHub { owner = "Foldex"; repo = "AdwSteamGtk"; rev = "v${version}"; hash = "sha256-aHJxgSb7oZTRrfFVYdLimwhSGzdRjGf7dGTRA+ANQiM="; }; buildInputs = [ libadwaita libportal-gtk4 ]; nativeBuildInputs = [ blueprint-compiler desktop-file-utils meson ninja wrapGAppsHook4 ]; propagatedBuildInputs = with python3Packages; [ packaging pygobject3 ]; meta = { description = "A simple Gtk wrapper for Adwaita-for-Steam"; homepage = "https://github.com/Foldex/AdwSteamGtk"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.reedrw ]; mainProgram = "adwaita-steam-gtk"; platforms = lib.platforms.linux; }; } </ins>


# XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share <ins> # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". # In nix, it is commonly set without containing these values, so we add them as fallback. # # [1] <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html> case ":$XDG_DATA_DIRS:" in *:/usr/local/share:*) ;; *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; esac case ":$XDG_DATA_DIRS:" in *:/usr/share:*) ;; *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/share" ;; esac </ins> # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1


SDL2 libusb1 dbus-glib <ins> gsettings-desktop-schemas </ins> ffmpeg libudev0-shim


# this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg <del> '' + lib.optionalString (lib.versionOlder version "1.78.0") '' </del> <ins> '' + lib.optionalString (lib.versionOlder version "1.78.0" && stdenv.isLinux) '' </ins> # see https://github.com/gentoo/gentoo/commit/4da5959 chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper '';


<ins> { lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "hcledit"; version = "0.2.7"; src = fetchFromGitHub { owner = "minamijoyo"; repo = pname; rev = "v${version}"; hash = "sha256-hunM29K6RgeVkY8nNNIYigCh2sTCR1OyPE+k3cmIJTU="; }; vendorHash = "sha256-KwoauyXeDMMTUgtLvz6m28nvFSl5fptZzEvwFVC3n8g="; meta = with lib; { description = "A command line editor for HCL"; homepage = "https://github.com/minamijoyo/hcledit"; license = licenses.mit; maintainers = with maintainers; [ aleksana ]; }; } </ins>


hcl2json = callPackage ../applications/misc/hcl2json { }; <ins> hcledit = callPackage ../tools/text/hcledit { }; </ins> hcxtools = callPackage ../tools/security/hcxtools { }; hcxdumptool = callPackage ../tools/security/hcxdumptool { };


{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText , coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs <del> , vmopts ? null </del> <ins> , python3, vmopts ? null </ins> }: { pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args:


item=${desktopItem} makeWrapper "$out/$pname/bin/${loName}.sh" "$out/bin/${pname}"  <del> --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}"  </del> <ins> --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git python3 ]}"  </ins> --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs


- [isolate](https://github.com/ioi/isolate), a sandbox for securely executing untrusted programs. Available as [security.isolate](#opt-security.isolate.enable). <ins> - [private-gpt](https://github.com/zylon-ai/private-gpt), a service to interact with your documents using the power of LLMs, 100% privately, no data leaks. Available as [services.private-gpt](#opt-services.private-gpt.enable). </ins> ## Backward Incompatibilities {#sec-release-24.05-incompatibilities} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->


./services/misc/polaris.nix ./services/misc/portunus.nix ./services/misc/preload.nix <ins> ./services/misc/private-gpt.nix </ins> ./services/misc/prowlarr.nix ./services/misc/pufferpanel.nix ./services/misc/pykms.nix


<ins> { config , lib , pkgs , ... }: let inherit (lib) types; format = pkgs.formats.yaml { }; cfg = config.services.private-gpt; in { options = { services.private-gpt = { enable = lib.mkEnableOption "private-gpt for local large language models"; package = lib.mkPackageOption pkgs "private-gpt" { }; stateDir = lib.mkOption { type = types.path; default = "/var/lib/private-gpt"; description = "State directory of private-gpt."; }; settings = lib.mkOption { type = format.type; default = { llm = { mode = "ollama"; tokenizer = ""; }; embedding = { mode = "ollama"; }; ollama = { llm_model = "llama3"; embedding_model = "nomic-embed-text"; api_base = "http://localhost:11434"; embedding_api_base = "http://localhost:11434"; keep_alive = "5m"; tfs_z = 1; top_k = 40; top_p = 0.9; repeat_last_n = 64; repeat_penalty = 1.2; request_timeout = 120; }; vectorstore = { database = "qdrant"; }; qdrant = { path = "/var/lib/private-gpt/vectorstore/qdrant"; }; data = { local_data_folder = "/var/lib/private-gpt"; }; openai = { }; azopenai = { }; }; description = '' settings-local.yaml for private-gpt ''; }; }; }; config = lib.mkIf cfg.enable { systemd.services.private-gpt = { description = "Interact with your documents using the power of GPT, 100% privately, no data leaks"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; preStart = let config = format.generate "settings-local.yaml" (cfg.settings // { server.env_name = "local"; }); in '' mkdir -p ${cfg.stateDir}/{settings,huggingface,matplotlib,tiktoken_cache} cp ${cfg.package.cl100k_base.tiktoken} ${cfg.stateDir}/tiktoken_cache/9b5ad71b2ce5302211f9c61530b329a4922fc6a4 cp ${pkgs.python3Packages.private-gpt}/${pkgs.python3.sitePackages}/private_gpt/settings.yaml ${cfg.stateDir}/settings/settings.yaml cp "${config}" "${cfg.stateDir}/settings/settings-local.yaml" chmod 600 "${cfg.stateDir}/settings/settings-local.yaml" ''; environment = { PGPT_PROFILES = "local"; PGPT_SETTINGS_FOLDER = "${cfg.stateDir}/settings"; HF_HOME = "${cfg.stateDir}/huggingface"; TRANSFORMERS_OFFLINE = "1"; HF_DATASETS_OFFLINE = "1"; MPLCONFIGDIR = "${cfg.stateDir}/matplotlib"; }; serviceConfig = { ExecStart = lib.getExe cfg.package; WorkingDirectory = cfg.stateDir; StateDirectory = "private-gpt"; RuntimeDirectory = "private-gpt"; RuntimeDirectoryMode = "0755"; PrivateTmp = true; DynamicUser = true; DevicePolicy = "closed"; LockPersonality = true; MemoryDenyWriteExecute = true; PrivateUsers = true; ProtectHome = true; ProtectHostname = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; ProtectControlGroups = true; ProcSubset = "pid"; RestrictNamespaces = true; RestrictRealtime = true; SystemCallArchitectures = "native"; UMask = "0077"; }; }; }; meta.maintainers = with lib.maintainers; [ drupol ]; } </ins>


pretix = runTest ./web-apps/pretix.nix; printing-socket = handleTest ./printing.nix { socket = true; }; printing-service = handleTest ./printing.nix { socket = false; }; <ins> private-gpt = handleTest ./private-gpt.nix {}; </ins> privoxy = handleTest ./privoxy.nix {}; prometheus = handleTest ./prometheus.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {};


<ins> import ./make-test-python.nix ({ pkgs, lib, ... }: let mainPort = "8001"; in { name = "private-gpt"; meta = with lib.maintainers; { maintainers = [ drupol ]; }; nodes = { machine = { ... }: { services.private-gpt = { enable = true; }; }; }; testScript = '' machine.start() machine.wait_for_unit("private-gpt.service") machine.wait_for_open_port(${mainPort}) machine.succeed("curl http://127.0.0.1:${mainPort}") ''; }) </ins>


<ins> { python3Packages , makeBinaryWrapper }: python3Packages.toPythonApplication (python3Packages.private-gpt.overrideAttrs (oldAttrs: { nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeBinaryWrapper ]; passthru.cl100k_base = { inherit (python3Packages.private-gpt.cl100k_base) tiktoken; }; postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/private-gpt  --prefix PYTHONPATH : "$PYTHONPATH"  --add-flags "-m private_gpt" ''; })) </ins>


<ins> { lib , buildPythonPackage , python , fetchFromGitHub , poetry-core , fastapi , injector , llama-index-core , llama-index-readers-file , huggingface-hub , python-multipart , pyyaml , transformers , uvicorn , watchdog , gradio , fetchurl , fetchpatch }: buildPythonPackage rec { pname = "private-gpt"; version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "zylon-ai"; repo = "private-gpt"; rev = "v${version}"; hash = "sha256-bjydzJhOJjmbflcJbuMyNsmby7HtNPFW3MY2Tw12cHw="; }; patches = [ # Fix a vulnerability, to be removed in the next bump version # See https://github.com/zylon-ai/private-gpt/pull/1890 (fetchpatch { url = "https://github.com/zylon-ai/private-gpt/commit/86368c61760c9cee5d977131d23ad2a3e063cbe9.patch"; hash = "sha256-4ysRUuNaHW4bmNzg4fn++89b430LP6AzYDoX2HplVH0="; }) ]; build-system = [ poetry-core ]; dependencies = [ fastapi injector llama-index-core llama-index-readers-file python-multipart pyyaml transformers uvicorn watchdog ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # This is needed for running the tests and the service in offline mode, # See related issue at https://github.com/zylon-ai/private-gpt/issues/1870 passthru.cl100k_base.tiktoken = fetchurl { url = "https://openaipublic.blob.core.windows.net/encodings/cl100k_base.tiktoken"; hash = "sha256-Ijkht27pm96ZW3/3OFE+7xAPtR0YyTWXoRO8/+hlsqc="; }; passthru.optional-dependencies = with python.pkgs; { embeddings-huggingface = [ huggingface-hub llama-index-embeddings-huggingface ]; embeddings-ollama = [ llama-index-embeddings-ollama ]; embeddings-openai = [ llama-index-embeddings-openai ]; embeddings-sagemaker = [ boto3 ]; llms-ollama = [ llama-index-llms-ollama ]; llms-openai = [ llama-index-llms-openai ]; llms-openai-like = [ llama-index-llms-openai-like ]; llms-sagemaker = [ boto3 ]; ui = [ gradio ]; vector-stores-chroma = [ llama-index-vector-stores-chroma ]; vector-stores-postgres = [ llama-index-vector-stores-postgres ]; vector-stores-qdrant = [ llama-index-vector-stores-qdrant ]; }; postInstall = '' cp settings*.yaml $out/${python.sitePackages}/private_gpt/ ''; pythonImportsCheck = [ "private_gpt" ]; meta = { changelog = "https://github.com/zylon-ai/private-gpt/blob/${src.rev}/CHANGELOG.md"; description = "Interact with your documents using the power of GPT, 100% privately, no data leaks"; homepage = "https://github.com/zylon-ai/private-gpt"; license = lib.licenses.asl20; mainProgram = "private-gpt"; maintainers = with lib.maintainers; [ drupol ]; }; } </ins>


ppdeep = callPackage ../development/python-modules/ppdeep { }; <ins> private-gpt = callPackage ../development/python-modules/private-gpt { }; </ins> prodict = callPackage ../development/python-modules/prodict { }; prometheus-pandas = callPackage ../development/python-modules/prometheus-pandas { };


{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify <del> , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome </del> <ins> , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome </ins> , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon , pname, meta, harfbuzz # High-DPI support: Spotify's --force-device-scale-factor argument


curlWithGnuTls dbus expat <del> ffmpeg </del> <ins> ffmpeg_4 # Requires libavcodec < 59 as of 1.2.9.743.g85d9593d </ins> fontconfig freetype gdk-pixbuf


ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so <del> ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir </del> <ins> ln -s ${ffmpeg_4.lib}/lib/libavcodec.so* $libdir ln -s ${ffmpeg_4.lib}/lib/libavformat.so* $libdir </ins> rpath="$out/share/spotify:$libdir"


libpsl nghttp2.lib rtmpdump <del> ] ++ steam-runtime-wrapped.overridePkgs </del> <ins> ] # This needs to come from pkgs as the passed-in steam-runtime-wrapped may not be the same architecture ++ pkgs.steamPackages.steam-runtime-wrapped.overridePkgs </ins> ++ extraLibraries pkgs; extraInstallCommands = lib.optionalString (steam != null) ''


pname = "matplotlib"; format = "pyproject"; <del> disabled = pythonOlder "3.9"; </del> <ins> disabled = pythonOlder "3.8"; </ins> src = fetchPypi { inherit pname version;


- The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`. <ins> - `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`. </ins> - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides ## Other Notable Changes {#sec-release-23.11-notable-changes}


let inherit (self) callPackage; <del> inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; </del> namePrefix = python.libPrefix + "-";


inherit lib pkgs stdenv; inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit buildPythonPackage buildPythonApplication; <del> inherit (pkgs) fetchPypi; </del> inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; inherit buildSetupcfg;


face_recognition_models = face-recognition-models; # added 2022-10-15 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 <ins> inherit (super.pkgs) fetchPypi; # added 2023-05-25 </ins> filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19 flaskbabel = flask-babel; # added 2023-01-19 flask_login = flask-login; # added 2022-10-17


<ins> { lib , stdenv , cmake , pkg-config , glib , fetchFromGitHub }: stdenv.mkDerivation rec { pname = "g3kb-switch"; version = "1.4"; src = fetchFromGitHub { owner = "lyokha"; repo = "g3kb-switch"; rev = version; sha256 = "sha256-mcZduHcteZ+nS0YEZG5DfmpA8xrnLhwxumq6hLuLPIs="; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib ]; meta = with lib; { homepage = "https://github.com/lyokha/g3kb-switch"; description = "CLI keyboard layout switcher for GNOME Shell"; license = licenses.bsd2; maintainers = with maintainers; [ Freed-Wu ]; platforms = platforms.unix; }; } </ins>


githubId = 1855930; name = "Ertugrul Söylemez"; }; <ins> esau79p = { github = "EsAu79p"; githubId = 21313906; name = "EsAu"; }; </ins> esclear = { github = "esclear"; githubId = 7432848;


<ins> # This file is automatically @generated by Cargo. # It is not intended for manual editing. version = 3 [[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ "libc", ] [[package]] name = "appdirs" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d512b3e61196d27562dcc71446a58ba8a93d3bed2a03a87f96101b9a17f1d378" dependencies = [ "ole32-sys", "shell32-sys", "winapi 0.2.8", ] [[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aw-client-rust" version = "0.1.0" source = "git+https://github.com/ActivityWatch/aw-server-rust.git#bd547add68b1028f018f25727799a48acb3188a2" dependencies = [ "aw-models", "chrono", "gethostname 0.4.1", "reqwest", "serde", "serde_json", ] [[package]] name = "aw-models" version = "0.1.0" source = "git+https://github.com/ActivityWatch/aw-server-rust.git#bd547add68b1028f018f25727799a48acb3188a2" dependencies = [ "chrono", "log", "schemars", "serde", "serde_json", ] [[package]] name = "aw-watcher-window-wayland" version = "0.1.0" dependencies = [ "appdirs", "aw-client-rust", "chrono", "file-lock", "gethostname 0.2.3", "getopts", "lazy_static", "mio 0.6.23", "serde_json", "smallvec", "timerfd", "wayland-client", "wayland-commons", "wayland-scanner", "wayland-sys", ] [[package]] name = "base64" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bumpalo" version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", "num-integer", "num-traits", "serde", "time", "wasm-bindgen", "winapi 0.3.9", ] [[package]] name = "codespan-reporting" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ "termcolor", "unicode-width", ] [[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", ] [[package]] name = "core-foundation-sys" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cxx" version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ "cc", "cxxbridge-flags", "cxxbridge-macro", "link-cplusplus", ] [[package]] name = "cxx-build" version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ "cc", "codespan-reporting", "once_cell", "proc-macro2", "quote", "scratch", "syn", ] [[package]] name = "cxxbridge-flags" version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] name = "cxxbridge-macro" version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", "syn", ] [[package]] name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dyn-clone" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "encoding_rs" version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "errno" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", "winapi 0.3.9", ] [[package]] name = "errno-dragonfly" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" dependencies = [ "cc", "libc", ] [[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] name = "file-lock" version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b16486239b3741480cef090b6f9924faf5dd5481022c6f266a51fab1a92971a2" dependencies = [ "gcc", "libc", "mktemp", "nix 0.11.1", ] [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ "foreign-types-shared", ] [[package]] name = "foreign-types-shared" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ "percent-encoding", ] [[package]] name = "fuchsia-cprng" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "fuchsia-zircon" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ "bitflags", "fuchsia-zircon-sys", ] [[package]] name = "fuchsia-zircon-sys" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures-channel" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", ] [[package]] name = "futures-core" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-io" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-sink" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-util" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-core", "futures-io", "futures-task", "memchr", "pin-project-lite", "pin-utils", "slab", ] [[package]] name = "gcc" version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "gethostname" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" dependencies = [ "libc", "winapi 0.3.9", ] [[package]] name = "gethostname" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a329e22866dd78b35d2c639a4a23d7b950aeae300dfd79f4fb19f74055c2404" dependencies = [ "libc", "windows", ] [[package]] name = "getopts" version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" dependencies = [ "unicode-width", ] [[package]] name = "h2" version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", "http", "indexmap", "slab", "tokio", "tokio-util", "tracing", ] [[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hermit-abi" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] [[package]] name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", "itoa", ] [[package]] name = "http-body" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", "pin-project-lite", ] [[package]] name = "httparse" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", "socket2", "tokio", "tower-service", "tracing", "want", ] [[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", "hyper", "native-tls", "tokio", "tokio-native-tls", ] [[package]] name = "iana-time-zone" version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", "winapi 0.3.9", ] [[package]] name = "iana-time-zone-haiku" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" dependencies = [ "cxx", "cxx-build", ] [[package]] name = "idna" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] name = "indexmap" version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", ] [[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "io-lifetimes" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ "libc", "windows-sys 0.45.0", ] [[package]] name = "iovec" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" dependencies = [ "libc", ] [[package]] name = "ipnet" version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "itoa" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "js-sys" version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] name = "kernel32-sys" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" dependencies = [ "winapi 0.2.8", "winapi-build", ] [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "link-cplusplus" version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] [[package]] name = "linux-raw-sys" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "log" version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "maybe-uninit" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "mime" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mio" version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" dependencies = [ "cfg-if 0.1.10", "fuchsia-zircon", "fuchsia-zircon-sys", "iovec", "kernel32-sys", "libc", "log", "miow", "net2", "slab", "winapi 0.2.8", ] [[package]] name = "mio" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.45.0", ] [[package]] name = "miow" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" dependencies = [ "kernel32-sys", "net2", "winapi 0.2.8", "ws2_32-sys", ] [[package]] name = "mktemp" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77001ceb9eed65439f3dc2a2543f9ba1417d912686bf224a7738d0966e6dcd69" dependencies = [ "uuid", ] [[package]] name = "native-tls" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", "log", "openssl", "openssl-probe", "openssl-sys", "schannel", "security-framework", "security-framework-sys", "tempfile", ] [[package]] name = "net2" version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" dependencies = [ "cfg-if 0.1.10", "libc", "winapi 0.3.9", ] [[package]] name = "nix" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "becb657d662f1cd2ef38c7ad480ec6b8cf9e96b27adb543e594f9cf0f2e6065c" dependencies = [ "bitflags", "cc", "cfg-if 0.1.10", "libc", "void", ] [[package]] name = "nix" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" dependencies = [ "bitflags", "cc", "cfg-if 0.1.10", "libc", "void", ] [[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", ] [[package]] name = "num-traits" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ "hermit-abi", "libc", ] [[package]] name = "ole32-sys" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" dependencies = [ "winapi 0.2.8", "winapi-build", ] [[package]] name = "once_cell" version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ "bitflags", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", "openssl-macros", "openssl-sys", ] [[package]] name = "openssl-macros" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", "syn", ] [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" dependencies = [ "autocfg", "cc", "libc", "pkg-config", "vcpkg", ] [[package]] name = "percent-encoding" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pin-project-lite" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "proc-macro2" version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] [[package]] name = "quote" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] [[package]] name = "rand" version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" dependencies = [ "libc", "rand 0.4.6", ] [[package]] name = "rand" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" dependencies = [ "fuchsia-cprng", "libc", "rand_core 0.3.1", "rdrand", "winapi 0.3.9", ] [[package]] name = "rand_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" dependencies = [ "rand_core 0.4.2", ] [[package]] name = "rand_core" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" [[package]] name = "rdrand" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" dependencies = [ "rand_core 0.3.1", ] [[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags", ] [[package]] name = "reqwest" version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ "base64", "bytes", "encoding_rs", "futures-core", "futures-util", "h2", "http", "http-body", "hyper", "hyper-tls", "ipnet", "js-sys", "log", "mime", "native-tls", "once_cell", "percent-encoding", "pin-project-lite", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "winreg", ] [[package]] name = "rustc-serialize" version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" [[package]] name = "rustix" version = "0.36.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", "windows-sys 0.45.0", ] [[package]] name = "ryu" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "schannel" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ "windows-sys 0.42.0", ] [[package]] name = "schemars" version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" dependencies = [ "chrono", "dyn-clone", "schemars_derive", "serde", "serde_json", ] [[package]] name = "schemars_derive" version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", "syn", ] [[package]] name = "scratch" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "security-framework" version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", "core-foundation-sys", "libc", "security-framework-sys", ] [[package]] name = "security-framework-sys" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", ] [[package]] name = "serde" version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", "syn", ] [[package]] name = "serde_derive_internals" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", "syn", ] [[package]] name = "serde_json" version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ "itoa", "ryu", "serde", ] [[package]] name = "serde_urlencoded" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", "itoa", "ryu", "serde", ] [[package]] name = "shell32-sys" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" dependencies = [ "winapi 0.2.8", "winapi-build", ] [[package]] name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] [[package]] name = "smallvec" version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" dependencies = [ "maybe-uninit", ] [[package]] name = "socket2" version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", "winapi 0.3.9", ] [[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] [[package]] name = "tempfile" version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if 1.0.0", "fastrand", "redox_syscall", "rustix", "windows-sys 0.42.0", ] [[package]] name = "termcolor" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "time" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] [[package]] name = "timerfd" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0664936efa25f2bbe03ca25b62c50f5f492abec07e59d6dcf45131014b33483f" dependencies = [ "rustix", ] [[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", "libc", "memchr", "mio 0.8.6", "num_cpus", "pin-project-lite", "socket2", "windows-sys 0.42.0", ] [[package]] name = "tokio-native-tls" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", ] [[package]] name = "tokio-util" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", "tracing", ] [[package]] name = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", "tracing-core", ] [[package]] name = "tracing-core" version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", ] [[package]] name = "try-lock" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "unicode-bidi" version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "url" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] [[package]] name = "uuid" version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c590b5bd79ed10aad8fb75f078a59d8db445af6c743e55c4a53227fc01c13f" dependencies = [ "rand 0.3.23", "rustc-serialize", ] [[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "void" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "want" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ "log", "try-lock", ] [[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wayland-client" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bcc929c26d59a655b0d2cd337299326acc1f6e3d4434c3ae2d6c78d32290ca4" dependencies = [ "bitflags", "downcast-rs", "libc", "nix 0.15.0", "wayland-commons", "wayland-scanner", "wayland-sys", ] [[package]] name = "wayland-commons" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "539cdd0c296802332d763ff663739a7f83bdf67b3df58e99fe0215e96a495142" dependencies = [ "nix 0.15.0", "smallvec", "spin", "wayland-sys", ] [[package]] name = "wayland-scanner" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43ea5ea1a117137d72c0c197431d198d69783b5e8ca996b0583c98e10b44d426" dependencies = [ "proc-macro2", "quote", "xml-rs", ] [[package]] name = "wayland-sys" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "537500923d50be11d95a63c4cb538145e4c82edf61296b7debc1f94a1a6514ed" [[package]] name = "web-sys" version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] name = "winapi" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", ] [[package]] name = "winapi-build" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ "winapi 0.3.9", ] [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] [[package]] name = "windows-sys" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] [[package]] name = "windows-sys" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi 0.3.9", ] [[package]] name = "ws2_32-sys" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" dependencies = [ "winapi 0.2.8", "winapi-build", ] [[package]] name = "xml-rs" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" </ins>


<ins> { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, }: rustPlatform.buildRustPackage rec { pname = "aw-watcher-window-wayland"; version = "6108ad3df8e157965a43566fa35cdaf144b1c51b"; src = fetchFromGitHub { owner = "ActivityWatch"; repo = pname; rev = version; hash = "sha256-xl9+k6xJp5/t1QPOYfnBLyYprhhrzjzByDKkT3dtVVQ="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "aw-client-rust-0.1.0" = "sha256-9tlVesnBeTlazKE2UAq6dzivjo42DT7p7XMuWXHHlnU="; }; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; meta = with lib; { description = "WIP window and afk watcher for wayland "; homepage = "https://github.com/ActivityWatch/aw-watcher-window-wayland"; license = licenses.mpl20; maintainers = with maintainers; [ esau79p ]; }; } </ins>


activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { }; <ins> aw-watcher-window-wayland = callPackage ../tools/wayland/aw-watcher-window-wayland {  }; </ins> adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; adl = callPackage ../applications/video/adl { };


darwin.apple_sdk.frameworks.CoreServices ]; <del> passthru.updateScript = ./update.sh; </del> <ins> passthru.updateScript = nix-update-script { extraArgs = [ "--version" "branch" ]; }; </ins> meta = with lib; { description = "Reindeer is a tool which takes Rust Cargo dependencies and generates Buck build rules";


<del> #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=./. -i bash -p curl jq nix-prefetch common-updater-scripts mktemp nix coreutils # First, check that we only update once per day since the version tag is dependent on the date. NEW_VERSION="unstable-$(date -u +%F)" CURRENT_VERSION=$(nix-instantiate --eval -E "with import ./. {}; reindeer.version" | tr -d '"') if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then echo "skipping reindeer update within same day (version: "$CURRENT_VERSION")" exit 0 fi # Second, let's check if there's a new commit to main. NEW_REV=$(curl https://api.github.com/repos/facebookincubator/reindeer/branches/main | jq '.commit.sha') CURRENT_REV=$(nix-instantiate --eval -E "with import ./. {}; reindeer.src.rev") if [[ "$NEW_REV" == "$CURRENT_REV" ]]; then echo "reindeer is up-to-date (rev: $CURRENT_REV)" exit 0 fi echo "updating reindeer (new: $NEW_REV) (old: $CURRENT_REV)" # Generate the new lockfile in a temporary directory. pushd $(mktemp -d) git clone https://github.com/facebookincubator/reindeer.git --depth=1 pushd reindeer cargo generate-lockfile LOCKFILE=$(realpath ./Cargo.lock) popd popd cp $LOCKFILE pkgs/development/tools/reindeer/ # Get the new sha256 value. TRIMMED_REV=$(echo $NEW_REV | tr -d '"') HASH_RAW=$(nix-prefetch-url https://github.com/facebookincubator/reindeer/archive/${TRIMMED_REV}.tar.gz --unpack --type sha256) HASH_SRI=$(nix hash to-sri --type sha256 ${HASH_RAW}) # Update the file accordingly. update-source-version reindeer "$NEW_VERSION" ${HASH_SRI} --rev=${TRIMMED_REV} </del>


<ins> {stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: stdenv.mkDerivation rec { version = "0.15.2"; name = "vala-${version}"; src = fetchurl { url = "mirror://gnome/sources/vala/0.15/${name}.tar.xz"; sha256 = "0g71zq6dpqrw2f40wfzdf18fdw41ymr17laqniy2kr622hkxdi8w"; }; buildNativeInputs = [ yacc flex pkgconfig xz ]; buildInputs = [ glib ]; meta = { description = "Compiler for the GObject type system"; homepage = "http://live.gnome.org/Vala"; license = "free-copyleft"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.antono ]; }; } </ins>


<ins> {stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: stdenv.mkDerivation rec { version = "0.16.1"; name = "vala-${version}"; src = fetchurl { url = "mirror://gnome/sources/vala/0.16/${name}.tar.xz"; sha256 = "1n708n9ixyy9qrzyv1wf4ybvcclx43ib9ki028wwpvkz6kv8zqlb"; }; buildNativeInputs = [ yacc flex pkgconfig xz ]; buildInputs = [ glib ]; meta = { description = "Compiler for the GObject type system"; homepage = "http://live.gnome.org/Vala"; license = "free-copyleft"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.antono ]; }; } </ins>


{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: stdenv.mkDerivation rec { <del> name = "vala-0.14.2"; </del> <ins> version = "0.17.2"; name = "vala-${version}"; </ins> src = fetchurl { <del> url = mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz; sha256 = "1l5kllw9vpwv24lzv9fp64l3sad46wpxgvsgryrwlrjg91w6jzl0"; </del> <ins> url = "mirror://gnome/sources/vala/0.17/${name}.tar.xz"; sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3"; </ins> }; buildNativeInputs = [ yacc flex pkgconfig xz ];


meta = { description = "Compiler for the GObject type system"; homepage = "http://live.gnome.org/Vala"; <ins> license = "free-copyleft"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.antono ]; </ins> }; }


urweb = callPackage ../development/compilers/urweb { }; <del> vala = callPackage ../development/compilers/vala { }; </del> <ins> vala = vala17; vala15 = callPackage ../development/compilers/vala/15.2.nix { }; vala16 = callPackage ../development/compilers/vala/16.1.nix { }; vala17 = callPackage ../development/compilers/vala/default.nix { }; </ins> visualcpp = callPackage ../development/compilers/visual-c++ { };


<ins> { lib , stdenv , fetchFromGitHub , cmake , ffmpeg , freeglut , freeimage , glew , glfw , glm , libGL , libpulseaudio , libX11 , libXau , libXdmcp , libXext , libXpm , libXrandr , libXxf86vm , lz4 , mpv , pkg-config , SDL2 , SDL2_mixer , zlib }: stdenv.mkDerivation { pname = "linux-wallpaperengine"; version = "unstable-2023-09-23"; src = fetchFromGitHub { owner = "Almamu"; repo = "linux-wallpaperengine"; # upstream lacks versioned releases rev = "21c38d9fd1d3d89376c870cec5c5e5dc7086bc3c"; hash = "sha256-bZlMHlNKSydh9eGm5cFSEtv/RV9sA5ABs99uurblBZY="; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ffmpeg freeglut freeimage glew glfw glm libGL libpulseaudio libX11 libXau libXdmcp libXext libXrandr libXpm libXxf86vm mpv lz4 SDL2 SDL2_mixer.all zlib ]; meta = { description = "Wallpaper Engine backgrounds for Linux"; homepage = "https://github.com/Almamu/linux-wallpaperengine"; license = lib.licenses.gpl3Only; mainProgram = "linux-wallpaperengine"; maintainers = with lib.maintainers; [ eclairevoyant ]; platforms = lib.platforms.linux; }; } </ins>


}; config = mkIf (cfg.provider != "libc") { <del> boot.kernel.sysctl."vm.max_map_count" = mkIf (cfg.provider == "graphene-hardened") (mkDefault 1048576); </del> environment.etc."ld-nix.so.preload".text = '' ${providerLibPath} '';


# Disable YAMA by default to allow easy debugging. boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0; <ins> # Improve compatibility with applications that allocate # a lot of memory, like modern games boot.kernel.sysctl."vm.max_map_count" = mkDefault 1048576; </ins> }; }


"fs.inotify.max_queued_events" = 1048576; "fs.inotify.max_user_instances" = 1048576; "fs.inotify.max_user_watches" = 1048576; <del> "vm.max_map_count" = 262144; </del> <ins> "vm.max_map_count" = 262144; # TODO: Default vm.max_map_count has been increased system-wide </ins> "kernel.dmesg_restrict" = 1; "net.ipv4.neigh.default.gc_thresh3" = 8192; "net.ipv6.neigh.default.gc_thresh3" = 8192;


export MOZILLA_OFFICIAL=1 '' + lib.optionalString stdenv.hostPlatform.isMusl '' # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator <ins> # TODO: Default vm.max_map_count has been increased, retest without this </ins> export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so '';


<del> { cmake , cudaPackages , fetchFromGitHub , lib , ninja , pkgs , python3Packages ? { } , pythonSupport ? false , stdenv , symlinkJoin , which }: let </del> <ins> { cmake, cudaPackages, fetchFromGitHub, lib, ninja, python3Packages ? {}, pythonSupport ? false, stdenv, symlinkJoin, which, }: let </ins> inherit (lib) lists strings; inherit (cudaPackages) backendStdenv cudaFlags; cuda-common-redist = with cudaPackages; [ <ins> cuda_cudart # cuda_runtime.h </ins> libcublas # cublas_v2.h libcusolver # cusolverDn.h libcusparse # cusparse.h


cuda-native-redist = symlinkJoin { name = "cuda-redist"; <del> paths = with cudaPackages; [ cuda_cudart # cuda_runtime.h cuda_nvcc ] ++ cuda-common-redist; </del> <ins> paths = with cudaPackages; [cuda_nvcc] ++ cuda-common-redist; </ins> }; cuda-redist = symlinkJoin {


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


regular2 = foreground; }; }; <ins> etc."gpg-agent.conf".text = '' pinentry-timeout 86400 ''; </ins> }; fonts.fonts = [ pkgs.inconsolata ];


virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; <del> enableOCR = true; </del> testScript = { nodes, ... }: '' import shlex <ins> import json q = shlex.quote NODE_GROUPS = ["nodes", "floating_nodes"] def swaymsg(command: str = "", succeed=True, type="command"): assert command != "" or type != "command", "Must specify command or type" shell = q(f"swaymsg -t {q(type)} -- {q(command)}") with machine.nested( f"sending swaymsg {shell!r}" + " (allowed to fail)" * (not succeed) ): ret = (machine.succeed if succeed else machine.execute)( f"su - alice -c {shell}" ) # execute also returns a status code, but disregard. if not succeed: _, ret = ret if not succeed and not ret: return None parsed = json.loads(ret) return parsed </ins> <del> def swaymsg(command: str, succeed=True): with machine.nested(f"sending swaymsg {command!r}" + " (allowed to fail)" * (not succeed)): (machine.succeed if succeed else machine.execute)( f"su - alice -c {shlex.quote('swaymsg -- ' + command)}" ) </del> <ins> def walk(tree): yield tree for group in NODE_GROUPS: for node in tree.get(group, []): yield from walk(node) def wait_for_window(pattern): def func(last_chance): nodes = (node["name"] for node in walk(swaymsg(type="get_tree"))) if last_chance: nodes = list(nodes) machine.log(f"Last call! Current list of windows: {nodes}") return any(pattern in name for name in nodes) retry(func) </ins> start_all() machine.wait_for_unit("multi-user.target")


# Test XWayland (foot does not support X): swaymsg("exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty") <del> machine.wait_for_text("alice@machine") </del> <ins> wait_for_window("alice@machine") </ins> machine.send_chars("test-x11n") machine.wait_for_file("/tmp/test-x11-exit-ok") print(machine.succeed("cat /tmp/test-x11.out"))