jiebi/CodeConvo huggingface dataset:
<ins> { lib, stdenv, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, alsa-lib, at-spi2-atk, at-spi2-core, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype, glib, glibc, gtk3, gtk4, libcanberra, liberation_ttf, libexif, libglvnd, libkrb5, libnotify, libpulseaudio, libu2f-host, libva, libxkbcommon, mesa, nspr, nss, pango, pciutils, pipewire, qt6, speechd, systemd, udev, _7zz, vaapiVdpau, vulkan-loader, wayland, wget, xdg-utils, xfce, xorg, }: stdenv.mkDerivation rec { pname = "thorium-browser"; version = "120.0.6099.235"; src = fetchurl { url = "https://github.com/Alex313031/thorium/releases/download/M${version}/thorium-browser_${version}_amd64.deb"; hash = "sha256-UQqYXlkjXuZ3Vkcie0SNp4AMnBjemavW2G7dKGTxVAc="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook qt6.wrapQtAppsHook ]; buildInputs = [ stdenv.cc.cc.lib alsa-lib at-spi2-atk at-spi2-core cairo cups curl dbus expat ffmpeg fontconfig freetype glib glibc gtk3 gtk4 libcanberra liberation_ttf libexif libglvnd libkrb5 libnotify libpulseaudio libu2f-host libva libxkbcommon mesa nspr nss qt6.qtbase pango pciutils pipewire speechd udev _7zz vaapiVdpau vulkan-loader wayland wget xdg-utils xfce.exo xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXcomposite xorg.libXdamage xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrandr xorg.libXrender xorg.libXtst xorg.libXxf86vm ]; # Needed to make the process get past zygote_linux fork()'ing runtimeDependencies = [ systemd ]; autoPatchelfIgnoreMissingDeps = [ "libQt5Widgets.so.5" "libQt5Gui.so.5" "libQt5Core.so.5" ]; installPhase = '' runHook preInstall mkdir -p $out cp -vr usr/* $out cp -vr etc $out cp -vr opt $out ln -sf $out/opt/chromium.org/thorium/thorium-browser $out/bin/thorium-browser substituteInPlace $out/share/applications/thorium-shell.desktop  --replace /usr/bin $out/bin  --replace /opt $out/opt substituteInPlace $out/share/applications/thorium-browser.desktop  --replace /usr/bin $out/bin  --replace StartupWMClass=thorium StartupWMClass=thorium-browser  --replace Icon=thorium-browser Icon=$out/opt/chromium.org/thorium/product_logo_256.png addAutoPatchelfSearchPath $out/chromium.org/thorium addAutoPatchelfSearchPath $out/chromium.org/thorium/lib substituteInPlace $out/opt/chromium.org/thorium/thorium-browser  --replace 'export LD_LIBRARY_PATH' "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${lib.makeLibraryPath buildInputs}:$out/chromium.org/thorium:$out/chromium.org/thorium/lib" makeWrapper "$out/opt/chromium.org/thorium/thorium-browser" "$out/bin/thorium-browser"  --add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" runHook postInstall ''; postPatchMkspecs = '' substituteInPlace $out/bin/..thorium-shell-wrapped-wrapped  --replace /opt $out/opt ''; meta = with lib; { description = "Compiler-optimized Chromium fork"; homepage = "https://thorium.rocks"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ rgri ]; license = licenses.bsd3; platforms = ["x86_64-linux"]; mainProgram = "thorium-browser"; }; } </ins>
<del> { stdenv, fetchFromGitHub, autoconf, automake, libtool, ... }: </del> <ins> { stdenv, fetchFromGitHub, autoreconfHook, jdk # Enable ECDSA pubkey recovery module , enableRecovery ? true # Enable ECDH shared secret computation (disabled by default because it is # experimental) , enableECDH ? false # Enable libsecp256k1_jni (disabled by default because it requires a jdk, # which is a large dependency) , enableJNI ? false }: let inherit (stdenv.lib) optionals; in </ins> stdenv.mkDerivation rec { name = "secp256k1-${version}"; <del> # I can't find any version numbers, so we're just using the date # of the last commit. version = "2016-05-30"; </del> <ins> # I can't find any version numbers, so we're just using the date of the # last commit. version = "2016-11-27"; </ins> src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; <del> rev = "b3be8521e694eaf45dd29baea035055183c42fe2"; sha256 = "1pgsy72w87yxbiqn96hnm8alsfx3rj7d9jlzdsypyf6i1rf6w4bq"; </del> <ins> rev = "2928420c1b8e1feee8c20dff4e3cc41a0de2fc22"; sha256 = "1djsr2vrhh88353czlwb8bwlyabf008w1f7xg0fs3q33rf42w5gm"; </ins> }; <del> buildInputs = [ autoconf automake libtool ]; </del> <ins> buildInputs = optionals enableJNI [ jdk ]; </ins> <del> configureFlags = [ "--enable-module-recovery" ]; </del> <ins> nativeBuildInputs = [ autoreconfHook ]; </ins> <del> preConfigure = "./autogen.sh"; </del> <ins> configureFlags = optionals enableECDH [ "--enable-module-ecdh" "--enable-experimental" ] ++ optionals enableRecovery [ "--enable-module-recovery" ] ++ optionals enableJNI [ "--enable-jni" ]; </ins> meta = with stdenv.lib; { description = "Optimized C library for EC operations on curve secp256k1"; longDescription = '' <del> Optimized C library for EC operations on curve secp256k1. Part of Bitcoin Core. This library is a work in progress and is being used to research best practices. Use at your own risk. </del> <ins> Optimized C library for EC operations on curve secp256k1. Part of Bitcoin Core. This library is a work in progress and is being used to research best practices. Use at your own risk. </ins> ''; homepage = https://github.com/bitcoin-core/secp256k1; license = with licenses; [ mit ];
<ins> { lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "vt-cli"; version = "0.10.2"; src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; rev = version; sha256 = "0jqr2xf6f9ywavkx5hzcfnky8ax23ahdj24hjsnq6zlpdqvfn1xb"; }; vendorSha256 = "sha256-XN6dJpoJe9nJn+Tr9SYD64LE0XFiO2vlpdyI9SrZZjQ="; ldflags = [ "-X github.com/VirusTotal/vt-cli/cmd.Version=${version}" ]; subPackages = [ "vt" ]; meta = with lib; { description = "VirusTotal Command Line Interface"; homepage = "https://github.com/VirusTotal/vt-cli"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; }; } </ins>
PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; <del> installFlags = [ "DESTDIR=$(out)" ]; </del> <ins> PKG_CONFIG_PIDGIN_DATADIR = "${placeholder "out"}/share"; </ins> meta = with lib; { homepage = "https://github.com/hoehermann/libpurple-signald";
<ins> { lib , buildPythonPackage , fetchFromGitHub , huggingface-hub , nltk , numpy , scikit-learn , scipy , sentencepiece , tokenizers , torch , torchvision , tqdm , transformers }: buildPythonPackage rec { pname = "sentence-transformers"; version = "2.2.2"; format = "setuptools"; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "v${version}"; hash = "sha256-hEYpDAL0lliaS1j+c5vaZ0q1hw802jfTUurx/FvgY9w="; }; propagatedBuildInputs = [ huggingface-hub nltk numpy scikit-learn scipy sentencepiece tokenizers torch torchvision tqdm transformers ]; pythonImportsCheck = [ "sentence_transformers" ]; doCheck = false; # tests fail at build_ext meta = with lib; { description = "Multilingual Sentence & Image Embeddings with BERT"; homepage = "https://github.com/UKPLab/sentence-transformers"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; }; } </ins>
<ins> { lib , fetchFromGitHub , python3Packages , qt6 }: python3Packages.buildPythonApplication rec { pname = "khoj"; version = "0.2.5"; format = "setuptools"; src = fetchFromGitHub { owner = "debanjum"; repo = "khoj"; rev = version; hash = "sha256-cylZNRyHMFJiBjlEtKMpRjRjwQyb7pgOjMtxFhKFU4k="; }; propagatedBuildInputs = with python3Packages; [ aiofiles dateparser defusedxml fastapi huggingface-hub jinja2 numpy openai pillow pydantic pyqt6 pyyaml schedule sentence-transformers torch torchvision transformers uvicorn ]; buildInputs = with qt6; [ qtwayland ]; nativeBuildInputs = with qt6; [ wrapQtAppsHook ]; checkInputs = with python3Packages; [ pytest ]; postPatch = '' substituteInPlace setup.py  --replace "aiofiles == 0.8.0" "aiofiles >= 0.8.0"  --replace "openai == 0.20.0" "openai >= 0.20.0"  --replace "pytest == 7.1.2" "pytest >= 7.1.2"  --replace "fastapi == 0.77.1" "fastapi >= 0.77.1"  --replace "numpy == 1.22.4" "numpy >= 1.22.4"  --replace "huggingface_hub == 0.8.1" "huggingface_hub >= 0.8.1"  --replace "dateparser == 1.1.1" "dateparser >= 1.1.1"  --replace "sentence-transformers == 2.1.0" "sentence-transformers >= 2.1.0"  --replace "transformers == 4.21.0" "transformers >= 4.21.0"  --replace "torchvision == 0.14.1" "torchvision"  --replace "pydantic == 1.9.1" "pydantic >= 1.9.1"  --replace "pyqt6 == 6.3.1" "pyqt6 >= 6.3.1"  --replace "uvicorn == 0.17.6" "uvicorn >= 0.17.6" ''; meta = with lib; { description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos"; homepage = "https://github.com/debanjum/khoj"; license = licenses.gpl3Only; maintainers = with maintainers; [ dit7ya ]; }; } </ins>
<ins> { lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk }: stdenv.mkDerivation rec { pname = "theme-sh"; version = "1.1.5"; src = fetchFromGitHub { owner = "lemnos"; repo = "theme.sh"; rev = "v${version}"; sha256 = "sha256-zDw8WGBzO4/HRCgN7yoUxT49ibTz+QkRa5WpBQbl1nI="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; installPhase = '' runHook preInstall mkdir -p $out/bin install -Dm755 bin/theme.sh $out/bin wrapProgram $out/bin/theme.sh  --prefix PATH : ${lib.makeBinPath [ coreutils gawk ]} runHook postInstall ''; meta = with lib; { description = "A script which lets you set your $terminal theme"; homepage = "https://github.com/lemnos/theme.sh"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ figsoda ]; mainProgram = "theme.sh"; }; } </ins>
# disregard the error code from the xz invocation. Otherwise, # it can happen that tar exits earlier, causing xz to fail # from a SIGPIPE. <del> (XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn"; true) | tar xf - --warning=no-timestamp </del> <ins> (XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn"; true) | tar xf - --mode=+w --warning=no-timestamp </ins> ;; *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz) # GNU tar can automatically select the decompression method # (info "(tar) gzip"). <del> tar xf "$fn" --warning=no-timestamp </del> <ins> tar xf "$fn" --mode=+w --warning=no-timestamp </ins> ;; *) return 1
{ stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { <del> name = "ikarus-0.0.3"; </del> <ins> version = "0.0.3"; name = "ikarus-${version}"; </ins> src = fetchurl { <del> url = "http://ikarus-scheme.org/${name}.tar.gz"; </del> <ins> url = "http://launchpad.net/ikarus/0.0/${version}/+download/${name}.tar.gz"; </ins> sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv"; };
<ins> { lib , fetchFromGitHub , buildPythonPackage # propagates , numpy , torch , tqdm , more-itertools , transformers , ffmpeg-python # tests , pytestCheckHook }: buildPythonPackage rec { pname = "whisper"; version = "unstable-2022-09-23"; format = "setuptools"; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "8cf36f3508c9acd341a45eb2364239a3d81458b9"; hash = "sha256-2RH8eM/SezqFJltelv5AjQEGpqXm980u57vrlkTEUvQ="; }; postPatch = '' # Rely on the ffmpeg path already patched into the ffmpeg-python library substituteInPlace whisper/audio.py  --replace 'run(cmd="ffmpeg",' 'run(' ''; propagatedBuildInputs = [ numpy torch tqdm more-itertools transformers ffmpeg-python ]; preCheck = '' export HOME=$TMPDIR ''; checkInputs = [ pytestCheckHook ]; disabledTests = [ # requires network access to download models "test_transcribe" ]; meta = with lib; { description = "General-purpose speech recognition model"; homepage = "https://github.com/openai/whisper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; } </ins>
in stdenv.mkDerivation { inherit pname version; <del> desktopItem = makeDesktopItem { </del> <ins> desktopItem = makeDesktopItem ({ </ins> name = applicationName; exec = "${launcherName} %U"; inherit icon; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; <del> genericName = "Web Browser"; categories = [ "Network" "WebBrowser" ]; mimeTypes = [ "text/html" "text/xml" "application/xhtml+xml" "application/vnd.mozilla.xul+xml" "x-scheme-handler/http" "x-scheme-handler/https" "x-scheme-handler/ftp" ]; </del> <ins> startupNotify = true; </ins> startupWMClass = wmClass; <del> actions = { new-window = { name = "New Window"; exec = "${launcherName} --new-window %U"; }; new-private-window = { name = "New Private Window"; exec = "${launcherName} --private-window %U"; }; profile-manager-window = { name = "Profile Manager"; exec = "${launcherName} --ProfileManger"; }; }; }; </del> <ins> terminal = false; } // (if libName == "thunderbird" then { genericName = "Email Client"; comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars."; categories = [ "Network" "Chat" "Email" "Feed" "GTK" "News" ]; keywords = [ "mail" "email" "e-mail" "messages" "rss" "calendar" "address book" "addressbook" "chat" ]; mimeTypes = [ "message/rfc822" "x-scheme-handler/mailto" "text/calendar" "text/x-vcard" ]; actions = { profile-manager-window = { name = "Profile Manager"; exec = "${launcherName} --ProfileManger"; }; }; } else { genericName = "Web Browser"; categories = [ "Network" "WebBrowser" ]; mimeTypes = [ "text/html" "text/xml" "application/xhtml+xml" "application/vnd.mozilla.xul+xml" "x-scheme-handler/http" "x-scheme-handler/https" ]; actions = { new-window = { name = "New Window"; exec = "${launcherName} --new-window %U"; }; new-private-window = { name = "New Private Window"; exec = "${launcherName} --private-window %U"; }; profile-manager-window = { name = "Profile Manager"; exec = "${launcherName} --ProfileManger"; }; }; })); </ins> nativeBuildInputs = [ makeWrapper lndir jq ]; buildInputs = [ browser.gtk3 ];
"clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", <del> "version": "2022.2.1", "sha256": "a0d9e77ad4afbb5f7d69e23cf84ccf132eed6ead6c3a7cd442b33924e6931656", "url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.tar.gz", </del> <ins> "version": "2022.2.3", "sha256": "e0338107115231c4b354870dfcf537ba6ad1741a0d310e4e50c48dfc24ff9cce", "url": "https://download.jetbrains.com/cpp/CLion-2022.2.3.tar.gz", </ins> "version-major-minor": "2022.1", <del> "build_number": "222.3739.54" </del> <ins> "build_number": "222.4167.35" </ins> }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", <del> "version": "2022.2.1", "sha256": "4015bfa478f7ee33914975b530f13930bc32eff86223e9256f2610497f95825f", "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.tar.gz", </del> <ins> "version": "2022.2.5", "sha256": "55b28f3b79eda126fe778e2945804d50b1145503737f1b5e25ab6ae2d2a0e3ae", "url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.5.tar.gz", </ins> "version-major-minor": "2022.1.1", <del> "build_number": "222.3345.126" </del> <ins> "build_number": "222.4345.5" </ins> }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", <del> "version": "2022.2.2", "sha256": "c3cfc300f55adc3a52528d13a1133bffd2aa7c2d20ea301cd20e3aff52d87609", "url": "https://download.jetbrains.com/go/goland-2022.2.2.tar.gz", </del> <ins> "version": "2022.2.3", "sha256": "fda47d9939b95d8995d1a375443025599cd74b1b5a2966273477ecfafa9ce4f1", "url": "https://download.jetbrains.com/go/goland-2022.2.3.tar.gz", </ins> "version-major-minor": "2022.1", <del> "build_number": "222.3739.57" </del> <ins> "build_number": "222.4167.25" </ins> }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", <del> "version": "2022.2.1", "sha256": "93eb9391a898aad164ca47965e0445cbf0f04d7062b6875c4e4a3136799ee6cf", "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.tar.gz", </del> <ins> "version": "2022.2.3", "sha256": "4ba5faafad48d58db5099fae080ae2238086d3d9803080082de8efe35d8bf4ed", "url": "https://download.jetbrains.com/idea/ideaIC-2022.2.3.tar.gz", </ins> "version-major-minor": "2022.1", <del> "build_number": "222.3739.54" </del> <ins> "build_number": "222.4345.14" </ins> }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", <del> "version": "2022.2.1", "sha256": "43eee4b9ea9aed7601252823689e7232b39829784a9bab5e8b5462f55eecc83a", "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-no-jbr.tar.gz", </del> <ins> "version": "2022.2.3", "sha256": "7454d7e0b8f4e3d8d805dde645d28b842101bd77aea8b29125880c592e6b8c85", "url": "https://download.jetbrains.com/idea/ideaIU-2022.2.3-no-jbr.tar.gz", </ins> "version-major-minor": "2022.1", <del> "build_number": "222.3739.54" </del> <ins> "build_number": "222.4345.14" </ins> }, "mps": { "update-channel": "MPS RELEASE",
shardsFile = ./shards.nix; crystalBinaries.invidious = { src = "src/invidious.cr"; <del> options = [ "--release" "--progress" "--verbose" "--no-debug" "-Dskip_videojs_download" ]; </del> <ins> options = [ "--release" "--progress" "--verbose" "--no-debug" "-Dskip_videojs_download" "-Ddisable_quic" ]; </ins> }; postConfigure = ''
<ins> diff --git a/vendor/adb/client/usb_linux.cpp b/vendor/adb/client/usb_linux.cpp index 25a50bd..0d09c47 100644 --- a/vendor/adb/client/usb_linux.cpp +++ b/vendor/adb/client/usb_linux.cpp @@ -59,8 +59,15 @@ using namespace std::literals; #define DBGX(x...) struct usb_handle { +    usb_handle() : urb_in(0), urb_out(0) { +      this->urb_in = new usbdevfs_urb; +      this->urb_out = new usbdevfs_urb; +    } + ~usb_handle() { if (fd != -1) unix_close(fd); +      delete urb_in; +      delete urb_out; } std::string path; @@ -72,8 +79,8 @@ struct usb_handle { unsigned zero_mask; unsigned writeable = 1; -    usbdevfs_urb urb_in; -    usbdevfs_urb urb_out; +    usbdevfs_urb *urb_in; +    usbdevfs_urb *urb_out; bool urb_in_busy = false; bool urb_out_busy = false; @@ -304,7 +311,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) { std::unique_lock<std::mutex> lock(h->mutex); D("++ usb_bulk_write ++"); -    usbdevfs_urb* urb = &h->urb_out; +    usbdevfs_urb* urb = h->urb_out; memset(urb, 0, sizeof(*urb)); urb->type = USBDEVFS_URB_TYPE_BULK; urb->endpoint = h->ep_out; @@ -343,7 +350,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { std::unique_lock<std::mutex> lock(h->mutex); D("++ usb_bulk_read ++"); -    usbdevfs_urb* urb = &h->urb_in; +    usbdevfs_urb* urb = h->urb_in; memset(urb, 0, sizeof(*urb)); urb->type = USBDEVFS_URB_TYPE_BULK; urb->endpoint = h->ep_in; @@ -388,7 +395,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { } D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length); -        if (out == &h->urb_in) { +        if (out == h->urb_in) { D("[ reap urb - IN complete ]"); h->urb_in_busy = false; if (urb->status != 0) { @@ -397,7 +404,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { } return urb->actual_length; } -        if (out == &h->urb_out) { +        if (out == h->urb_out) { D("[ reap urb - OUT compelete ]"); h->urb_out_busy = false; h->cv.notify_all(); @@ -501,10 +508,10 @@ void usb_kick(usb_handle* h) { ** but this ensures that a reader blocked on REAPURB ** will get unblocked */ -            ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in); -            ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out); -            h->urb_in.status = -ENODEV; -            h->urb_out.status = -ENODEV; +            ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_in); +            ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_out); +            h->urb_in->status = -ENODEV; +            h->urb_out->status = -ENODEV; h->urb_in_busy = false; h->urb_out_busy = false; h->cv.notify_all(); </ins>
chown ${bindUser} /var/run/named ''; <del> script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; </del> <ins> script = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; </ins> unitConfig.Documentation = "man:named(8)"; }; };
sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754"; }; <del> outputs = [ "bin" "lib" "dev" "out" "man" "dnsutils" "host" ]; </del> <ins> outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; </ins> patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
moveToOutput bin/isc-config.sh $dev moveToOutput bin/host $host <del> ln -sf $host/bin/host $bin/bin </del> moveToOutput bin/dig $dnsutils moveToOutput bin/nslookup $dnsutils moveToOutput bin/nsupdate $dnsutils <del> ln -sf $dnsutils/bin/{dig,nslookup,nsupdate} $bin/bin ln -sf $host/bin/host $dnsutils/bin </del> for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g'
version = "1.1.4"; format = "pyproject"; <ins> disabled = pythonOlder "3.6"; </ins> src = fetchPypi { inherit pname version; <del> sha256 = "1c9jksza0gg2gva3liy0s8riv6imjavhnqw05m8l5660knq2yb2y"; </del> <ins> hash = "sha256-XiwvsJ3AmEJRLYBjC7eSNZodM9LARzrUfuI9oL6eMrE="; </ins> }; <ins> postPatch = '' # https://github.com/timothycrosley/hypothesis-auto/pull/20 substituteInPlace pyproject.toml  --replace 'pydantic = ">=0.32.2<2.0.0"' 'pydantic = ">=0.32.2, <2.0.0"'  --replace 'hypothesis = ">=4.36<6.0.0"' 'hypothesis = "*"' ''; </ins> nativeBuildInputs = [ poetry ];
domain-needed dhcp-hostsfile=/var/run/xen/dnsmasq.etherfile dhcp-authoritative <del> dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END,$XEN_BRIDGE_NETWORK_ADDRESS </del> <ins> dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END </ins> dhcp-no-override no-ping dhcp-leasefile=/var/run/xen/dnsmasq.leasefile
python3Packages.buildPythonApplication rec { pname = "scdl"; <del> version = "2.7.2"; </del> <ins> version = "2.7.3"; format = "setuptools"; </ins> src = python3Packages.fetchPypi { inherit pname version; <del> sha256 = "7d6212591a5bccf017424f732535475fb9ae3bab26a4fb5bc36064962d33f8e0"; </del> <ins> sha256 = "60284b7b058040d4847f2e4b0ab906b10e959d51f976a0188641e8e10685474f"; </ins> }; propagatedBuildInputs = with python3Packages; [
in map (x: "${mountPoint x}.mount") (getPoolFilesystems pool); <del> getKeyLocations = pool: if isBool cfgZfs.requestEncryptionCredentials then "${cfgZfs.package}/sbin/zfs list -rHo name,keylocation,keystatus ${pool}" else "${cfgZfs.package}/sbin/zfs list -Ho name,keylocation,keystatus ${toString (filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials)}"; </del> <ins> getKeyLocations = pool: if isBool cfgZfs.requestEncryptionCredentials then { hasKeys = cfgZfs.requestEncryptionCredentials; command = "${cfgZfs.package}/sbin/zfs list -rHo name,keylocation,keystatus ${pool}"; } else let keys = filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials; in { hasKeys = keys != []; command = "${cfgZfs.package}/sbin/zfs list -Ho name,keylocation,keystatus ${toString keys}"; }; </ins> createImportService = { pool, systemd, force, prefix ? "" }: nameValuePair "zfs-import-${pool}" {
RemainAfterExit = true; }; environment.ZFS_FORCE = optionalString force "-f"; <del> script = (importLib { </del> <ins> script = let keyLocations = getKeyLocations pool; in (importLib { </ins> # See comments at importLib definition. zpoolCmd = "${cfgZfs.package}/sbin/zpool"; awkCmd = "${pkgs.gawk}/bin/awk";
done poolImported "${pool}" || poolImport "${pool}"  # Try one last time, e.g. to import a degraded pool. if poolImported "${pool}"; then <del> ${optionalString (if isBool cfgZfs.requestEncryptionCredentials then cfgZfs.requestEncryptionCredentials else cfgZfs.requestEncryptionCredentials != []) '' ${getKeyLocations pool} | while IFS=$'t' read ds kl ks; do </del> <ins> ${optionalString keyLocations.hasKeys '' ${keyLocations.command} | while IFS=$'t' read ds kl ks; do </ins> { if [[ "$ks" != unavailable ]]; then continue
<del> { stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: </del> <ins> { lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: </ins> <del> stdenv.mkDerivation { </del> <ins> mkDerivation { </ins> name = "twmn-git-2018-10-01"; src = fetchFromGitHub {