jiebi/CodeConvo huggingface dataset:
# Resources in the jar can't be found, workaround copied from AUR cp -r build/resources $out/share/java/jabref <del> # workaround for https://github.com/NixOS/nixpkgs/issues/162064 </del> tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1 <del> unzip $out/lib/javafx-web-*-linux${lib.optionalString stdenv.isAarch64 "-aarch64"}.jar libjfxwebkit.so -d $out/lib/ </del> <ins> # remove openjfx libs for other platforms rm $out/lib/javafx-*-win.jar ${lib.optionalString stdenv.isAarch64 "$out/lib/javafx-*-linux.jar"} # workaround for https://github.com/NixOS/nixpkgs/issues/162064 unzip $out/lib/javafx-web-*.jar libjfxwebkit.so -d $out/lib/ </ins> DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/1/p" $out/bin/JabRef | sed -e "s|$APP_HOME|$out|g" -e 's/"//g') rm $out/bin/*
{ lib , stdenv , fetchurl <ins> , directoryListingUpdater </ins> , SDL2 , SDL2_image , SDL2_mixer , SDL2_ttf <del> , directoryListingUpdater </del> }: <del> stdenv.mkDerivation rec { </del> <ins> stdenv.mkDerivation (self: { </ins> pname = "lbreakouthd"; <del> version = "1.1"; </del> <ins> version = "1.1.1"; </ins> src = fetchurl { <del> url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; hash = "sha256-5hjS0aJ5f8Oe0aSuVgcV10h5OmWsaMHF5B9wYVFrlDY="; </del> <ins> url = "mirror://sourceforge/lgames/lbreakouthd-${self.version}.tar.gz"; hash = "sha256-ljnZpuV9HPPR5bgdbyE8gUtb4m+JppxGm3MV691sw7E="; </ins> }; buildInputs = [
hardeningDisable = [ "format" ]; passthru.updateScript = directoryListingUpdater { <del> inherit pname version; </del> <ins> inherit (self) pname version; </ins> url = "https://lgames.sourceforge.io/LBreakoutHD/"; extraRegex = "(?!.*-win(32|64)).*"; }; <del> meta = with lib; { broken = stdenv.isDarwin; </del> <ins> meta = { </ins> homepage = "https://lgames.sourceforge.io/LBreakoutHD/"; description = "A widescreen Breakout clone"; <del> license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; </del> <ins> license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; </ins> inherit (SDL2.meta) platforms; <ins> broken = stdenv.isDarwin; </ins> }; <del> } </del> <ins> }) </ins>
# NOTE: We essentially override the compilers provided by stdenv because we don't have a hook #   for cudaPackages to swap in compilers supported by NVCC. + lib.optionalString cudaSupport '' <del> export CC=${cudatoolkit.cc}/bin/cc export CXX=${cudatoolkit.cc}/bin/c++ </del> <ins> export CC=${backendStdenv.cc}/bin/cc export CXX=${backendStdenv.cc}/bin/c++ </ins> export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}" export FORCE_CUDA=1 '';
preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" <del> --add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" </del> <ins> # Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043 #--add-flags "''${NIXOS_OZONE_WL:+''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" </ins> --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} )
]); checkPhase = '' <ins> # Temporarily disable a test failing after a patch imagemagick update. # It might only due to the reporting and matching used in the test. # See https://github.com/NixOS/nixpkgs/issues/223446 # See https://sourceforge.net/p/gscan2pdf/bugs/417/ # #   Failed test 'valid TIFF created' #   at t/131_save_tiff.t line 44. #                   'test.tif TIFF 70x46 70x46+0+0 8-bit sRGB 10024B 0.000u 0:00.000 # ' #     doesn't match '(?^:test.tif TIFF 70x46 70x46+0+0 8-bit sRGB [7|9][.d]+K?B)' rm t/131_save_tiff.t </ins> # Temporarily disable a dubiously failing test: # t/169_import_scan.t ........................... 1/1 # #   Failed test 'variable-height scan imported with expected size'
mesaPackage = mkOption { type = types.package; <del> default = pkgs.mesa_23; defaultText = literalExpression "pkgs.mesa_23"; </del> <ins> default = pkgs.mesa; defaultText = literalExpression "pkgs.mesa"; </ins> example = literalExpression "pkgs.mesa_22"; description = lib.mdDoc '' The Mesa driver package used for rendering support on the system.
}; mesaPackage32 = mkOption { type = types.package; <del> default = pkgs.pkgsi686Linux.mesa_23; defaultText = literalExpression "pkgs.pkgsi686Linux.mesa_23"; </del> <ins> default = pkgs.pkgsi686Linux.mesa; defaultText = literalExpression "pkgs.pkgsi686Linux.mesa"; </ins> example = literalExpression "pkgs.pkgsi686Linux.mesa_22"; description = lib.mdDoc '' Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit
mkDerivation rec { pname = "organicmaps"; <del> version = "2023.03.05-5"; </del> <ins> version = "2023.04.02-7"; </ins> src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; <del> sha256 = "sha256-PfudozmrL8jNS/99nxSn0B3E53W34m4/ZN0y2ucB2WI="; </del> <ins> sha256 = "sha256-xXBzHo7IOo2f1raGnpFcsvs++crHMI5SACIc345cX7g="; </ins> fetchSubmodules = true; };
# symbolic name and `patch' is the actual patch.  The patch may # optionally be compressed with gzip or bzip2. kernelPatches ? [] <del> , ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name or "" != "pc" </del> <ins> , ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc" </ins> , extraMeta ? {} , isZen      ? false
, isHardened ? false # easy overrides to stdenv.hostPlatform.linux-kernel members <del> , autoModules ? stdenv.hostPlatform.linux-kernel.autoModules or true </del> <ins> , autoModules ? stdenv.hostPlatform.linux-kernel.autoModules </ins> , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false , kernelArch ? stdenv.hostPlatform.linuxArch , kernelTests ? []
++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ lib.optional (lib.versionAtLeast version "5.2") pahole; <ins> platformName = stdenv.hostPlatform.linux-kernel.name; </ins> # e.g. "defconfig" <del> kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig"; </del> <ins> kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig; # e.g. "bzImage" kernelTarget = stdenv.hostPlatform.linux-kernel.target; </ins> makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags ++ extraMakeFlags;
{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl <del> , libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, ubootTools </del> <ins> , libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole </ins> , fetchpatch }:
}) ]; <ins> # Tweaks to fix undefined variable substitutions # https://github.com/HowardHinnant/date/pull/538#pullrequestreview-1373268697 postPatch = '' substituteInPlace date.pc.in  --replace '@CMAKE_INSTALL_LIB@' '@CMAKE_INSTALL_FULL_LIBDIR@'  --replace '@CMAKE_INSTALL_INCLUDE@' '@CMAKE_INSTALL_FULL_INCLUDEDIR@'  --replace '@PACKAGE_VERSION@' '${version}' ''; </ins> nativeBuildInputs = [ cmake ]; cmakeFlags = [
<ins> { lib , rustPlatform , fetchFromGitHub , cmake , pkg-config , wrapGAppsHook , atk , glib , gtk3-x11 }: rustPlatform.buildRustPackage rec { pname = "ukmm"; version = "0.7.1"; src = fetchFromGitHub { owner = "NiceneNerd"; repo = pname; rev = "v${version}"; sha256 = "sha256-TvRaaAVJPqvTTqs+d5d4y1KmDTvE41uP5AykLtHxD9w="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "catppuccin-egui-1.0.2" = "sha256-+ILfvDgZxe/QPJuVqIbRjaHNovpRAX+ym2QZ96glb4w="; "ecolor-0.20.0" = "sha256-uTDkNRWsA1nM8Qhb0X2LjVDRuaW31vWxR8kDLL27BVE="; "egui-notify-0.4.0" = "sha256-jybtUnv9xqzulZ5nfg+T1u8iTOsPjKGVVQ7JhwbvPdU="; "egui_commonmark-0.6.0" = "sha256-hsVbtL2F+jifnzN6FgcDAVtLd1bVxTs0twn0SMvq9eU="; "egui_dock-0.2.1" = "sha256-gGIO0boXKxLu0ABDH/uJhEZEoE/ql8E65LRmr0Xhv3s="; "junction-0.2.0" = "sha256-6+pPp5wG1NoIj16Z+OvO4Pvy0jnQibn/A9cTaHAEVq4="; "msbt-0.1.1" = "sha256-PtBs60xgYrwS7yPnRzXpExwYUD3azIaqObRnnJEL5dE="; "msyt-1.2.1" = "sha256-aw5whCoQBhO0u9Fx2rTO1sRuPdGnAAlmPWv5q8CbQcI="; }; }; RUSTC_BOOTSTRAP = true; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ atk glib gtk3-x11 ]; cargoTestFlags = [ "--all" ]; checkFlags = [ # Requires a game dump of Breath of the Wild "--skip=gui::tasks::tests::remerge" "--skip=pack::tests::pack_mod" "--skip=project::tests::project_from_mod" "--skip=tests::read_meta" "--skip=unpack::tests::read_mod" "--skip=unpack::tests::unpack_mod" "--skip=unpack::tests::unzip_mod" # Requires Clear Camera mod "--skip=bnp::test_convert" ]; meta = with lib; { description = "A new mod manager for The Legend of Zelda: Breath of the Wild"; homepage = "https://github.com/NiceneNerd/ukmm"; changelog = "https://github.com/NiceneNerd/ukmm/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; }; } </ins>
<ins> { lib , rustPlatform , fetchFromGitLab , pkg-config , openssl , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-info"; version = "0.7.3"; src = fetchFromGitLab { owner = "imp"; repo = "cargo-info"; rev = version; hash = "sha256-m8YytirD9JBwssZFO6oQ9TGqjqvu1GxHN3z8WKLiKd4="; }; cargoHash = "sha256-gI/DGPCVEi4Mg9nYLaPpeqpV7LBbxoLP0ditU6hPS1w="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "Cargo subcommand to show crates info from crates.io"; homepage = "https://gitlab.com/imp/cargo-info"; changelog = "https://gitlab.com/imp/cargo-info/-/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ figsoda ]; }; } </ins>
{ stdenv , lib , fetchFromGitLab , gettext , meson , ninja , pkg-config <del> , python3 </del> , rustPlatform , wrapGAppsHook4 , appstream-glib , desktop-file-utils , glib , gtk4 <ins> , gdk-pixbuf </ins> , libadwaita , Foundation }: stdenv.mkDerivation rec { pname = "gnome-obfuscate"; <del> version = "0.0.7"; </del> <ins> version = "0.0.9"; </ins> src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Obfuscate"; rev = version; <del> sha256 = "sha256-jEMOg2yHi6K57XhA/7hkwwvedmikoB8pGV3ka+jixq8="; </del> <ins> hash = "sha256-aUhzact437V/bSsG2Ddu2mC03LbyXFg+hJiuGy5NQfQ="; </ins> }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; <del> sha256 = "sha256-P04BeidLXouPLzT/vsa4VC5AOENF0W4gqXqzdmRFhmE="; </del> <ins> hash = "sha256-HUQvdCmzjdmuJGDLtC/86yzbRimLzx+XbW29f+Ua48w="; </ins> }; nativeBuildInputs = [ gettext <del> glib </del> meson ninja pkg-config <del> python3 </del> rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc wrapGAppsHook4 <ins> appstream-glib desktop-file-utils </ins> ]; buildInputs = [ <del> appstream-glib desktop-file-utils </del> glib gtk4 <ins> gdk-pixbuf </ins> libadwaita ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; <del> postPatch = '' patchShebangs build-aux/meson_post_install.py ''; </del> meta = with lib; { description = "Censor private information"; homepage = "https://gitlab.gnome.org/World/obfuscate"; license = licenses.gpl3Plus; <del> maintainers = with maintainers; [ fgaz ]; </del> platforms = platforms.all; <ins> mainProgram = "obfuscate"; maintainers = with maintainers; [ fgaz ]; </ins> }; }
<ins> { lib , buildGoModule , fetchFromSourcehut , libxkbcommon , pkg-config }: buildGoModule rec { pname = "dotool"; version = "1.3"; src = fetchFromSourcehut { owner = "~geb"; repo = "dotool"; rev = version; hash = "sha256-z0fQ+qenHjtoriYSD2sOjEvfLVtZcMJbvnjKZFRSsMA="; }; vendorHash = "sha256-v0uoG9mNaemzhQAiG85RequGjkSllPd4UK2SrLjfm7A="; # uses nix store path for the dotool binary # also replaces /bin/echo with echo patches = [ ./fix-paths.patch ]; postPatch = '' substituteInPlace ./dotoold --replace "@dotool@" "$out/bin/dotool" ''; buildInputs = [ libxkbcommon ]; nativeBuildInputs = [ pkg-config ]; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; postInstall = '' mkdir -p $out/bin cp ./dotoold ./dotoolc $out/bin ''; meta = with lib; { description = "Command to simulate input anywhere"; homepage = "https://git.sr.ht/~geb/dotool"; changelog = "https://git.sr.ht/~geb/dotool/tree/${version}/item/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ dit7ya ]; }; } </ins>
<ins> diff --git a/dotoolc b/dotoolc index e2f7bba..6d1879e 100755 --- a/dotoolc +++ b/dotoolc @@ -7,7 +7,7 @@ is $DOTOOL_PIPE else /tmp/dotool-pipe.' >&2 fi fifo_being_read(){ -	[ -p "$1" ] && /bin/echo 1<>"$1" >"$1" +	[ -p "$1" ] && echo 1<>"$1" >"$1" } p="${DOTOOL_PIPE:-/tmp/dotool-pipe}" diff --git a/dotoold b/dotoold index d2d39a3..e46129c 100755 --- a/dotoold +++ b/dotoold @@ -7,7 +7,7 @@ for the pipe is $DOTOOL_PIPE else /tmp/dotool-pipe.' >&2 fi fifo_being_read(){ -	[ -p "$1" ] && /bin/echo 1<>"$1" >"$1" +	[ -p "$1" ] && echo 1<>"$1" >"$1" } p="${DOTOOL_PIPE:-/tmp/dotool-pipe}" @@ -20,5 +20,5 @@ fi rm -f -- "$p" || exit 1 trap 'rm -f -- "$p"; pkill -P $$; trap - EXIT; exit' EXIT INT TERM HUP mkfifo -m 660 "$p" || exit 1 -dotool <> "$p" & +@dotool@ <> "$p" & wait </ins>
${concatStringsSep " n" ([ "-f qcow2" ] ++ optional (cfg.useBootLoader && cfg.useDefaultFilesystems) "-F qcow2 -b ${systemImage}/nixos.qcow2" ++ optional (!(cfg.useBootLoader && cfg.useDefaultFilesystems)) "-o size=${toString config.virtualisation.diskSize}M" <del> ++ [ "$NIX_DISK_IMAGE" ])} </del> <ins> ++ [ ''"$NIX_DISK_IMAGE"'' ])} </ins> echo "Virtualisation disk image created." fi
# libfaketime fixes non-determinism related to timestamps ignoring FORCE_SOURCE_DATE # we cannot fix further randomness caused by luatex; for further details, see # https://salsa.debian.org/live-team/live-build/-/blob/master/examples/hooks/reproducible/2006-reproducible-texlive-binaries-fmt-files.hook.chroot#L52 <del> FORCE_SOURCE_DATE=1 TZ= faketime -f '@1980-01-01 00:00:00 x0.001' fmtutil --sys --all | grep '^fmtutil' # too verbose </del> <ins> # note that calling faketime and fmtutil is fragile (faketime uses LD_PRELOAD, fmtutil calls /bin/sh, causing potential glibc issues on non-NixOS) # so we patch fmtutil to use faketime, rather than calling faketime fmtutil substitute "$out/bin/fmtutil" fmtutil  --replace 'my $cmdline = "$eng -ini ' 'my $cmdline = "faketime -f '"'"'@1980-01-01 00:00:00 x0.001'"'"' $eng -ini ' FORCE_SOURCE_DATE=1 TZ= perl fmtutil --sys --all | grep '^fmtutil' # too verbose </ins> #texlinks "$out/bin" && wrapBin # do we need to regenerate format links? # Disable unavailable map files
}; config = mkIf cfg.enable { <del> systemd.user = { sockets.urxvtd = { description = "socket for urxvtd, the urxvt terminal daemon"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; socketConfig = { ListenStream = "%t/urxvtd-socket"; }; </del> <ins> systemd.user.services.urxvtd = { description = "urxvt terminal daemon"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; path = [ pkgs.xsel ]; serviceConfig = { ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd -o"; Environment = "RXVT_SOCKET=%t/urxvtd-socket"; Restart = "on-failure"; RestartSec = "5s"; </ins> }; <del> services.urxvtd = { description = "urxvt terminal daemon"; path = [ pkgs.xsel ]; serviceConfig = { ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd -o"; Environment = "RXVT_SOCKET=%t/urxvtd-socket"; Restart = "on-failure"; RestartSec = "5s"; }; }; </del> }; environment.systemPackages = [ pkgs.rxvt_unicode-with-plugins ];
sway-unwrapped.overrideAttrs (oldAttrs: rec { pname = "swayfx"; <del> version = "0.2"; </del> <ins> version = "0.3"; </ins> src = fetchFromGitHub { owner = "WillPower3309"; repo = "swayfx"; rev = version; <del> sha256 = "sha256-nVy7GdAnheWhjevcCPE407xWSLN8F4Le0uq2RDwv/Zc="; </del> <ins> sha256 = "sha256-3Odyeb10AGbNf6TI1W79sLiwB4PrszC5VzjCr7FuPz4="; </ins> }; <ins> # This patch was backported into SwayFX # remove when next release is rebased on Sway 1.9 patches = let removePatches = [ "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch" ]; in builtins.filter (patch: !builtins.elem (patch.name or null) removePatches) (oldAttrs.patches or [ ]); </ins> meta = with lib; { <del> description = "A Beautiful Sway Fork"; </del> <ins> description = "Sway, but with eye candy!"; </ins> homepage = "https://github.com/WillPower3309/swayfx"; maintainers = with maintainers; [ ricarch97 ]; license = licenses.mit;
<ins> { lib , buildDotnetModule , fetchurl , unzip , dos2unix , makeWrapper , msbuild , mono }: buildDotnetModule rec { pname = "networkminer"; version = "2.8"; src = fetchurl { # Upstream does not provide versioned releases, a mirror has been uploaded # to archive.org url = "https://archive.org/download/networkminer-${lib.replaceStrings ["."] ["-"] version}/NetworkMiner_${lib.replaceStrings ["."] ["-"] version}_source.zip"; sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv"; }; nativeBuildInputs = [ unzip dos2unix msbuild ]; patches = [ # Store application data in XDG_DATA_DIRS instead of trying to write to nix store ./xdg-dirs.patch ]; postPatch = '' # Not all files have UTF-8 BOM applied consistently find . -type f -exec dos2unix -m {} + # Embedded base64-encoded app icon in resx fails to parse. Delete it sed -zi 's|<data name="$this.Icon".*</data>||g' NetworkMiner/NamedPipeForm.resx sed -zi 's|<data name="$this.Icon".*</data>||g' NetworkMiner/UpdateCheck.resx ''; nugetDeps = ./deps.nix; buildPhase = '' runHook preBuild msbuild /p:Configuration=Release NetworkMiner.sln runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/bin $out/share cp -r NetworkMiner/bin/Release $out/share/NetworkMiner makeWrapper ${mono}/bin/mono $out/bin/NetworkMiner  --add-flags "$out/share/NetworkMiner/NetworkMiner.exe"  --add-flags "--noupdatecheck" install -D NetworkMiner/NetworkMiner.desktop $out/share/applications/NetworkMiner.desktop substituteInPlace $out/share/applications/NetworkMiner.desktop  --replace "Exec=mono NetworkMiner.exe %f" "Exec=NetworkMiner"  --replace "Icon=./networkminericon-96x96.png" "Icon=NetworkMiner" install -D NetworkMiner/networkminericon-96x96.png $out/share/pixmaps/NetworkMiner.png runHook postInstall ''; meta = with lib; { description = "The Open Source Network Forensic Analysis Tool (NFAT)"; homepage = "https://www.netresec.com/?page=NetworkMiner"; license = licenses.gpl2Only; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; mainProgram = "NetworkMiner"; }; } </ins>
<ins> # This file was automatically generated by passthru.fetch-deps. # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.2"; sha256 = "0js3dp26nszx82q0phv7hmsm5z23dva7javbmk6a91lbkm07y8p2"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.2"; sha256 = "1dny43jksy6dm9zrkdm8j80gb25w6wdvjlxnphj7ngf0fbg3dd2c"; }) ] </ins>
, buildPythonPackage , fetchFromGitHub , fetchpatch <ins> , setuptools </ins> , mypy , pytestCheckHook , python-lsp-server , pythonOlder <del> , toml </del> <ins> , tomli </ins> }: buildPythonPackage rec { pname = "pylsp-mypy"; <del> version = "0.6.6"; format = "setuptools"; </del> <ins> version = "0.6.7"; format = "pyproject"; </ins> disabled = pythonOlder "3.7"; src = fetchFromGitHub { <del> owner = "Richardk2n"; </del> <ins> owner = "python-lsp"; </ins> repo = "pylsp-mypy"; rev = "refs/tags/${version}"; <del> hash = "sha256-9B+GSEoQEqd1W/g0oup4xULKWOF0TgSG5DfBtyWA3vs="; </del> <ins> hash = "sha256-ZsNIw0xjxnU9Ue0C7TlhzVOCOCKEbCa2CsiiqeMb14I="; </ins> }; <ins> patches = [ # https://github.com/python-lsp/pylsp-mypy/pull/64 (fetchpatch { name = "fix-hanging-test.patch"; url = "https://github.com/python-lsp/pylsp-mypy/commit/90d28edb474135007804f1e041f88713a95736f9.patch"; hash = "sha256-3DVyUXVImRemXCuyoXlYbPJm6p8OnhBdEKmwjx88ets="; }) ]; nativeBuildInputs = [ setuptools ]; </ins> propagatedBuildInputs = [ mypy python-lsp-server <del> toml </del> <ins> ] ++ lib.optionals (pythonOlder "3.11") [ tomli </ins> ]; nativeCheckInputs = [
sys.stderr.write(msg.format(user)) return <del> basedir = os.path.join(TASKD_DATA_DIR, "keys", org, user) if os.path.exists(basedir): </del> <ins> keysdir = os.path.join(TASKD_DATA_DIR, "keys" ) orgdir  = os.path.join(keysdir       , org    ) userdir = os.path.join(orgdir        , user   ) if os.path.exists(userdir): </ins> raise OSError("Keyfile directory for {} already exists.".format(user)) <del> privkey = os.path.join(basedir, "private.key") pubcert = os.path.join(basedir, "public.cert") </del> <ins> privkey = os.path.join(userdir, "private.key") pubcert = os.path.join(userdir, "public.cert") </ins> try: <del> os.makedirs(basedir, mode=0o700) </del> <ins> # We change the permissions and the owner ship of the base directories # so that cfg.group and cfg.user could read the directories' contents. # See also: https://bugs.python.org/issue42367 for bd in [keysdir, orgdir, userdir]: # Allow cfg.group, but not others to read the contents of this group os.makedirs(bd, exist_ok=True) # not using mode= argument to makedirs intentionally - forcing the # permissions we want os.chmod(bd, mode=0o750) os.chown( bd, uid=pwd.getpwnam(TASKD_USER).pw_uid, gid=grp.getgrnam(TASKD_GROUP).gr_gid, ) </ins> certtool_cmd("-p", "--bits", CERT_BITS, "--outfile", privkey) <ins> os.chmod(privkey, 0o640) </ins> template_data = [ "organization = {0}".format(org),
}: let <del> version = "4.4.0"; </del> <ins> version = "4.4.4"; </ins> libsecp256k1_name = <del> if stdenv.isLinux then "libsecp256k1.so.0" else if stdenv.isDarwin then "libsecp256k1.0.dylib" </del> <ins> if stdenv.isLinux then "libsecp256k1.so.{v}" else if stdenv.isDarwin then "libsecp256k1.{v}.dylib" </ins> else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name =
owner = "spesmilo"; repo = "electrum"; rev = version; <del> sha256 = "sha256-lXMz0U7zgtCApBCGZcpOHvLcyOeGG0yJE/gr7Gv+yBQ="; </del> <ins> sha256 = "sha256-R5jFxqaKnqQ+WNp4l0u34wMFxlbIsQ+9qDQxiQEu6kM="; </ins> postFetch = '' mv $out ./all
src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; <del> sha256 = "sha256-SHV+fCDhfgIh7s8L7eDbKj8bkHSVm7J2PPQ4CQpp6cI="; </del> <ins> sha256 = "sha256-a0In9PARV3xSJCXggKicgmBBWjiUxGF/LbP4jLZTvxc="; </ins> }; postUnpack = ''
inherit buildCommand name; passAsFile = [ "buildCommand" ] ++ (derivationArgs.passAsFile or []); <ins> } // lib.optionalAttrs (! derivationArgs?meta) { </ins> pos = let args = builtins.attrNames derivationArgs; in if builtins.length args > 0 then builtins.unsafeGetAttrPos (builtins.head args) derivationArgs
<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>