jiebi/CodeConvo huggingface dataset:
<ins> { fetchzip, lib }: let version = "5.0"; in fetchzip { name = "khmeros-${version}"; url = "mirror://debian/pool/main/f/fonts-khmeros/fonts-khmeros_${version}.orig.tar.xz"; sha256 = "sha256-pS+7RQbGwlBxdCfSVxHmARCAkZrZttwYNlV/CrxqI+w="; postFetch = '' unpackDir="$TMPDIR/unpack" mkdir "$unpackDir" cd "$unpackDir" tar xf "$downloadedFile" --strip-components=1 mkdir -p $out/share/fonts cp *.ttf $out/share/fonts ''; meta = with lib; { description = "KhmerOS Unicode fonts for the Khmer language"; homepage = "http://www.khmeros.info/"; license = licenses.gpl2Plus; maintainers = with lib.maintainers; [ serge ]; platforms = platforms.all; }; } </ins>
kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; <ins> khmeros = callPackage ../data/fonts/khmeros {}; </ins> kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
<ins> { fetchzip, lib }: let version = "20170925"; in fetchzip { name = "nanum-${version}"; url = "mirror://ubuntu/pool/universe/f/fonts-nanum/fonts-nanum_${version}.orig.tar.xz"; sha256 = "sha256-lSTeQEuMmlQxiQqrx9tNScifE8nMOUDJF3lCfoAFIJk="; postFetch = '' unpackDir="$TMPDIR/unpack" mkdir "$unpackDir" cd "$unpackDir" tar xf "$downloadedFile" --strip-components=1 mkdir -p $out/share/fonts cp *.ttf $out/share/fonts ''; meta = with lib; { description = "Nanum Korean font set"; homepage = "https://hangeul.naver.com/font"; license = licenses.ofl; maintainers = with lib.maintainers; [ serge ]; platforms = platforms.all; }; } </ins>
(if stdenv.isLinux then '' find . -type f -perm -0100  -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  <del> --set-rpath "${libedit}/lib:${ncurses.out}/lib:${gmp.out}/lib" {} ; </del> <ins> --set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} ; </ins> for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} ; done
stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100  -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  <del> --set-rpath "${ncurses.out}/lib:${gmp.out}/lib" {} ; </del> <ins> --set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} ; </ins> sed -i "s|/usr/bin/perl|perlx00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gccx00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do
# find editline/gmp. stdenv.lib.optionalString stdenv.isLinux '' mkdir -p "$out/lib" <del> ln -sv "${ncurses.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" </del> <ins> ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" </ins> find . -type f -perm -0100  -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  --set-rpath "$out/lib:${gmp.out}/lib" {} ;
{ lib, stdenv, fetchurl, pkgconfig <ins> , abiVersion </ins> , mouseSupport ? false , unicode ? true , gpm }: let <del> inherit (stdenv) isDarwin; abiVersion = if isDarwin then "5" else "6"; version = if isDarwin then "5.9" else "6.0"; sha256 = if isDarwin </del> <ins> version = if abiVersion == "5" then "5.9" else "6.0"; sha256 = if abiVersion == "5" </ins> then "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh" else "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm"; in
<ins> https://bugs.gentoo.org/545114 extracted from the upstream change (which had many unrelated commits in one) From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" <dickey@invisible-island.net> Date: Sun, 7 Dec 2014 03:10:09 +0000 Subject: [PATCH] ncurses 5.9 - patch 20141206 + modify MKlib_gen.sh to work around change in development version of gcc introduced here: https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html (reports by Marcus Shawcroft, Maohui Lei). diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh index d8cc3c9..b91398c 100755 --- a/ncurses/base/MKlib_gen.sh +++ b/ncurses/base/MKlib_gen.sh @@ -474,11 +474,22 @@ sed -n -f $ED1  -e 's/gen_$//'  -e 's/  / /g' >>$TMP +cat >$ED1 <<EOF +s/  / /g +s/^ // +s/ $// +s/P_NCURSES_BOOL/NCURSES_BOOL/g +EOF + +# A patch discussed here: +#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html +# introduces spurious #line markers.  Work around that by ignoring the system's +# attempt to define "bool" and using our own symbol here. +sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 +cat $ED2 >$TMP + $preprocessor $TMP 2>/dev/null  -| sed  -	-e 's/  / /g'  -	-e 's/^ //'  -	-e 's/_Bool/NCURSES_BOOL/g'  +| sed -f $ED1  | $AWK -f $AW2  | sed -f $ED3  | sed  </ins>
notify-sharp = callPackage ../development/libraries/notify-sharp { }; <del> ncurses = callPackage ../development/libraries/ncurses { }; </del> <ins> ncurses5 = callPackage ../development/libraries/ncurses { abiVersion = "5"; }; ncurses6 = callPackage ../development/libraries/ncurses { abiVersion = "6"; }; ncurses = if stdenv.isDarwin then ncurses5 else ncurses6; </ins> neardal = callPackage ../development/libraries/neardal { };
<del> { libraw, fetchFromGitHub }: libraw.overrideAttrs (_: rec { version = "0.20.2"; src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; rev = version; sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; }; }) </del>
stdenv.mkDerivation { pname = "libraw"; <del> version = "unstable-2021-12-03"; </del> <ins> version = "0.20.2.p2"; </ins> src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; <del> rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad"; sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ="; </del> <ins> rev = "fedad11e87daad7b7d389a3ef84ccf10b5e84710"; # current 0.20-stable branch sha256 = "1mklf8lzybzyg75ja34822xlv6h9nw93griyrjjna7darl1dyvja"; </ins> }; outputs = [ "out" "lib" "dev" "doc" ];
<ins> { libraw, fetchFromGitHub }: libraw.overrideAttrs (_: rec { version = "unstable-2021-12-03"; src = fetchFromGitHub { owner = "LibRaw"; repo = "LibRaw"; rev = "52b2fc52e93a566e7e05eaa44cada58e3360b6ad"; sha256 = "kW0R4iPuqnFuWYDrl46ok3kaPcGgY2MqZT7mqVX+BDQ="; }; }) </ins>
fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; <del> freeimage = callPackage ../development/libraries/freeimage { }; </del> <ins> freeimage = callPackage ../development/libraries/freeimage { libraw = libraw_unstable; }; </ins> freetts = callPackage ../development/libraries/freetts { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; libraw = callPackage ../development/libraries/libraw { }; <del> libraw_0_20 = callPackage ../development/libraries/libraw/0_20.nix { }; </del> <ins> libraw_unstable = callPackage ../development/libraries/libraw/unstable.nix { }; </ins> libraw1394 = callPackage ../development/libraries/libraw1394 { };
{ lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, openssl, wrapGAppsHook, <del> avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } </del> <ins> avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }, fetchpatch </ins> }: mkDerivation rec {
fetchSubmodules = true; }; <ins> patches = [ # This patch can be removed when a new version of barrier (greater than 2.4.0) # is released, which will contain this commit. (fetchpatch { name = "add-missing-cstddef-header.patch"; url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch"; sha256 = "sha256-ajMxP7szBFi4h8cMT3qswfa3k/QiJ1FGI3q9fkCFQQk="; }) ]; </ins> buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; nativeBuildInputs = [ cmake wrapGAppsHook ];
import ./generic.nix (rec { version = "28.1"; <del> sha256 = "sha256-KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE="; </del> <ins> sha256 = "sha256-D33wnlxhx0LyG9WZaQDj2II3tG0HcJdZTC4dSA3lrgY="; </ins> patches = _: [ ]; })
TMPDIR="''${TMPDIR:-/tmp}"  HOME="$HOME"  XAUTHORITY="''${XAUTHORITY:-$HOME/.Xauthority}"  <del> DISPLAY="$DISPLAY"  </del> <ins> DISPLAY="''${DISPLAY:-}"  </ins> DBUS_SESSION_BUS_ADDRESS="''${DBUS_SESSION_BUS_ADDRESS:-unix:path=$XDG_RUNTIME_DIR/bus}"   XDG_DATA_HOME="$HOME/.local/share"
PULSE_SERVER="''${PULSE_SERVER:-}"  PULSE_COOKIE="''${PULSE_COOKIE:-}"   <del> MOZ_ENABLE_WAYLAND=$MOZ_ENABLE_WAYLAND  WAYLAND_DISPLAY="$WAYLAND_DISPLAY"  XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR"  XCURSOR_PATH="$XCURSOR_PATH"  </del> <ins> MOZ_ENABLE_WAYLAND="''${MOZ_ENABLE_WAYLAND:-}"  WAYLAND_DISPLAY="''${WAYLAND_DISPLAY:-}"  XDG_RUNTIME_DIR="''${XDG_RUNTIME_DIR:-}"  XCURSOR_PATH="''${XCURSOR_PATH:-}"  </ins>  APULSE_PLAYBACK_DEVICE="''${APULSE_PLAYBACK_DEVICE:-plug:dmix}"
LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null echo "Checking tor-browser wrapper ..." <del> DISPLAY="" MOZ_ENABLE_WAYLAND="" WAYLAND_DISPLAY="" XAUTHORITY=""  XCURSOR_PATH="" XDG_RUNTIME_DIR="" XDG_SESSION_TYPE=""  DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d)  </del> <ins> TBB_HOME=$(mktemp -d)  </ins> $out/bin/tor-browser --version >/dev/null '';
"${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup" "${config.boot.initrd.systemd.package.kbd}/bin/setfont" "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys" <del> "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # keyboard layouts are compressed </del> <ins> "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed ] ++ optionals (hasPrefix builtins.storeDir cfg.font) [ "${cfg.font}" ] ++ optionals (hasPrefix builtins.storeDir cfg.keyMap) [ "${cfg.keyMap}" </ins> ]; systemd.services.reload-systemd-vconsole-setup =
services.accounts-daemon.enable = true; # when changing an account picture the accounts-daemon reads a temporary file containing the image which systemsettings5 may place under /tmp systemd.services.accounts-daemon.serviceConfig.PrivateTmp = false; <ins> services.power-profiles-daemon.enable = mkDefault true; services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true); </ins> services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; <del> services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true); </del> services.xserver.libinput.enable = mkDefault true; # Extra UDEV rules used by Solid
<ins> { stdenv , lib , fetchurl , cmake , pkg-config , ninja , python3 , qtbase , qt5compat , qtdeclarative , qtdoc , qtquick3d , qtquicktimeline , qtserialport , qtsvg , qttools , qtwebengine , qtshadertools , wrapQtAppsHook , yaml-cpp , litehtml , gumbo , llvmPackages , rustc-demangle , elfutils , perf }: stdenv.mkDerivation rec { pname = "qtcreator"; version = "9.0.2"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; sha256 = "sha256-7KWMxcoNOXiWlAVCYZzyA/WWLuPIggCBIics23Ifoyg="; }; nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook python3 ninja ]; buildInputs = [ qtbase qtdoc qtsvg qtquick3d qtwebengine qtserialport qtshadertools qt5compat qtdeclarative qtquicktimeline yaml-cpp litehtml gumbo llvmPackages.libclang llvmPackages.llvm rustc-demangle elfutils ]; cmakeFlags = [ # workaround for missing CMAKE_INSTALL_DATAROOTDIR # in pkgs/development/tools/build-managers/cmake/setup-hook.sh "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" # qtdeclarative in nixpkgs does not provide qmlsc # fix can't find Qt6QmlCompilerPlusPrivate "-DQT_NO_FIND_QMLSC=TRUE" "-DWITH_DOCS=ON" "-DBUILD_DEVELOPER_DOCS=ON" "-DBUILD_QBS=OFF" "-DQTC_CLANG_BUILDMODE_MATCH=ON" "-DCLANGTOOLING_LINK_CLANG_DYLIB=ON" ]; qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ]; postInstall = '' substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop  --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" ''; meta = with lib; { description = "Cross-platform IDE tailored to the needs of Qt developers"; longDescription = '' Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers. It includes features such as an advanced code editor, a visual debugger and a GUI designer. ''; homepage = "https://wiki.qt.io/Qt_Creator"; license = licenses.lgpl3Plus; maintainers = [ maintainers.rewine ]; platforms = platforms.linux; }; } </ins>
inherit (linuxPackages) perf; }; <ins> qtcreator-qt6 = qt6Packages.callPackage ../development/tools/qtcreator/qt6.nix { inherit (linuxPackages) perf; stdenv = llvmPackages_14.stdenv; llvmPackages = llvmPackages_14; }; </ins> qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; r10k = callPackage ../tools/system/r10k { };
}; x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; <del> sha256 = "9gspydrGaEjzAM0nK1u0XNm07HTupJ2wnPxCFWy+Nts="; </del> <ins> sha256 = "8QIkF5+875VFoGK6T0CROsqML6bJDG934c1gkuz8Klk="; </ins> }; };
python2Packages.buildPythonApplication rec { name = "certbot-${version}"; <del> version = "0.11.1"; </del> <ins> version = "0.19.0"; </ins> src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; rev = "v${version}"; <del> sha256 = "0f8s6wzj69gnqld6iaskmmwyg5zy5v3zwhp1n1izxixm0vhkzgrq"; </del> <ins> sha256 = "14i3q59v7j0q2pa1dri420fhil4h0vgl4vb471hp81f4y14gq6h7"; </ins> }; propagatedBuildInputs = with python2Packages; [
pythonPackages.buildPythonApplication rec { pname = "simp_le-client"; <del> version = "0.2.0"; </del> <ins> version = "0.6.1"; </ins> name = "${pname}-${version}"; src = pythonPackages.fetchPypi { inherit pname version; <del> sha256 = "1zg18jfry9mvkri3yd2f5mwfsl27ac9zmnll3bm93jb91jhd6ssh"; </del> <ins> sha256 = "0x4fky9jizs3xi55cdy217cvm3ikpghiabysan71b07ackkdfj6k"; </ins> }; checkPhase = ''
"zsh_cv_sys_dynamic_strip_lib=yes" ]; <ins> preConfigure = '' # use pkg-config instead of pcre-config configureFlagsArray+=("PCRECONF=''${PKG_CONFIG} libpcre") ''; </ins> # the zsh/zpty module is not available on hydra # so skip groups Y Z checkFlags = map (T: "TESTNUM=${T}") (lib.stringToCharacters "ABCDEVW");
</listitem> <listitem> <para> <ins> <link xlink:href="https://dragonflydb.io/">dragonflydb</link>, a modern replacement for Redis and Memcached. Available as <link linkend="opt-services.dragonflydb.enable">services.dragonflydb</link>. </para> </listitem> <listitem> <para> </ins> <link xlink:href="https://github.com/leetronics/infnoise">infnoise</link>, a hardware True Random Number Generator dongle. Available as <link xlink:href="options.html#opt-services.infnoise.enable">services.infnoise</link>.
- [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable). <ins> - [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable). </ins> - [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable).
<ins> { fetchFromGitHub , fetchurl , lib , stdenv , double-conversion , gperftools , mimalloc , rapidjson , liburing , xxHash , abseil-cpp_202111 , gbenchmark , glog , gtest , jemalloc , gcc-unwrapped , autoconf , autoconf-archive , automake , cmake , ninja , boost , libunwind , libtool , openssl }: let pname = "dragonflydb"; version = "0.1.0"; src = fetchFromGitHub { owner = pname; repo = "dragonfly"; rev = "v${version}"; hash = "sha256-P6WMW/n+VezWDXGagT4B+ZYyCp8oufDV6MTrpKpLZcs="; fetchSubmodules = true; }; # Needed exactly 5.4.4 for patch to work lua = fetchurl { url = "https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz"; hash = "sha256-L/ibvqIqfIuRDWsAb1ukVZ7c9GiiVTfO35mI7ZD2tFA="; }; in stdenv.mkDerivation { inherit pname version src; postPatch = '' mkdir -p ./build/{third_party,_deps} ln -s ${double-conversion.src} ./build/third_party/dconv ln -s ${mimalloc.src} ./build/third_party/mimalloc ln -s ${rapidjson.src} ./build/third_party/rapidjson ln -s ${gbenchmark.src} ./build/_deps/benchmark-src ln -s ${gtest.src} ./build/_deps/gtest-src cp -R --no-preserve=mode,ownership ${gperftools.src} ./build/third_party/gperf cp -R --no-preserve=mode,ownership ${liburing.src} ./build/third_party/uring cp -R --no-preserve=mode,ownership ${xxHash.src} ./build/third_party/xxhash cp -R --no-preserve=mode,ownership ${abseil-cpp_202111.src} ./build/_deps/abseil_cpp-src cp -R --no-preserve=mode,ownership ${glog.src} ./build/_deps/glog-src chmod u+x ./build/third_party/uring/configure cp ./build/third_party/xxhash/cli/xxhsum.{1,c} ./build/third_party/xxhash patch -p1 -d ./build/_deps/glog-src < ${./glog.patch} sed ' s@REPLACEJEMALLOCURL@file://${jemalloc.src}@ s@REPLACELUAURL@file://${lua}@ ' ${./fixes.patch} | patch -p1 ''; nativeBuildInputs = [ autoconf autoconf-archive automake cmake ninja ]; buildInputs = [ boost libunwind libtool openssl ]; cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; ninjaFlags = "dragonfly"; doCheck = false; dontUseNinjaInstall = true; installPhase = '' runHook preInstall mkdir -p $out/bin cp ./dragonfly $out/bin runHook postInstall ''; meta = with lib; { description = "A modern replacement for Redis and Memcached"; homepage = "https://dragonflydb.io/"; license = licenses.bsl11; platforms = platforms.linux; maintainers = with maintainers; [ yureien ]; }; } </ins>
<ins> diff --git a/lib/CatalystX/Script/Server/Starman.pm b/lib/CatalystX/Script/Server/Starman.pm index 670bd74..7b3bd2e 100644 --- a/lib/CatalystX/Script/Server/Starman.pm +++ b/lib/CatalystX/Script/Server/Starman.pm @@ -9,7 +9,7 @@ our $VERSION = '0.02'; extends 'Catalyst::Script::Server'; -has '+fork' => ( default => 1, init_arg => undef ); +has '+fork' => ( default => 1 ); has [qw/ keepalive restart restart_delay restart_regex restart_directory/] => ( init_arg => undef, is => 'ro' ); @@ -70,7 +70,7 @@ CatalystX::Script::Server::Starman - Replace the development server with Starman -d --debug           force debug mode -f --fork            handle each request in a new process -                            (defaults to false) +                            (defaults to true) -? --help            display this help and exits -h --host            host (defaults to all) -p --port            port (defaults to 3000) </ins>
url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.02.tar.gz; sha256 = "0h02mpkc4cmi3jpvcd7iw7xyzx55bqvvl1qkf967gqkvpklm0qx5"; }; <ins> patches = [ # See Nixpkgs issues #16074 and #17624 ../development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch ]; </ins> buildInputs = [ TestWWWMechanizeCatalyst ]; propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; meta = {
<del> --- sbsigntools/configure.ac	2018-09-25 10:30:00.878766256 -0500 +++ configure.ac.new	2018-09-25 10:34:56.231277375 -0500 @@ -71,15 +71,16 @@ </del> <ins> diff --git a/configure.ac b/configure.ac index 4ffb68f..d8a8265 100644 --- a/configure.ac +++ b/configure.ac @@ -71,15 +71,16 @@ AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = " </ins> # no consistent view of where gnu-efi should dump the efi stuff, so find it ## <del> for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi; do </del> <ins> for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi ; do </ins> -    if test -e $path/crt0-efi-$EFI_ARCH.o; then -       CRTPATH=$path +    if test -e @@NIX_GNUEFI@@/$path/crt0-efi-$EFI_ARCH.o; then
-DEFI_FUNCTION_WRAPPER" CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS" <del> @@ -90,5 +91,5 @@ </del> <ins> @@ -90,5 +91,5 @@ AC_SUBST(EFI_ARCH, $EFI_ARCH) </ins> AC_SUBST(CRTPATH, $CRTPATH) AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]
, openssl, libuuid, gnu-efi, libbfd }: <del> stdenv.mkDerivation { </del> <ins> stdenv.mkDerivation rec { </ins> pname = "sbsigntool"; <del> version = "0.9.1"; </del> <ins> version = "0.9.4"; </ins> src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git"; <del> rev = "v0.9.1"; sha256 = "098gxmhjn8acxjw5bq59wq4xhgkpx1xn8kjvxwdzpqkwq9ivrsbp"; </del> <ins> rev = "v${version}"; sha256 = "sha256-dbjdA+hjII/k7wABTTJV5RBdy4KlNkFlBWEaX4zn5vg="; </ins> }; patches = [ ./autoconf.patch ];
meta = with lib; { description = "Tools for maintaining UEFI signature databases"; homepage    = "http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases"; <del> maintainers = [ maintainers.tstrobel ]; </del> <ins> maintainers = with maintainers; [ hmenke tstrobel ]; </ins> platforms   = [ "x86_64-linux" ]; # Broken on i686 license     = licenses.gpl3; };
meta.homepage = "https://github.com/vim-scripts/align/"; }; <ins> alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; version = "2022-04-22"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; rev = "4781fcfea5ddc1a92d41b32dc325132ed6fce7a8"; sha256 = "03i75403lskpgaqv7xp5hk4v6kqb0sv15ciil9jyj735ylhry3qq"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; </ins> aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; version = "2022-05-14";
https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, <ins> https://github.com/goolord/alpha-nvim/,HEAD, </ins> https://github.com/Olical/aniseed/,, https://github.com/pearofducks/ansible-vim/,, https://github.com/ckarnell/antonys-macro-repeater/,,
<ins> { lib , stdenv , fetchFromGitHub , dbus , fpc , getopt , glib , lazarus , libX11 , libqt5pas , wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "doublecmd"; version = "1.0.6"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${version}"; hash = "sha256-aEWu/bRVOwjK6QTWsMntRYwAfjuwo9SNuH4qkQn0mOY="; }; nativeBuildInputs = [ fpc getopt lazarus wrapQtAppsHook ]; buildInputs = [ dbus glib libX11 libqt5pas ]; NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; postPatch = '' patchShebangs build.sh install/linux/install.sh substituteInPlace build.sh  --replace '$(which lazbuild)' '"${lazarus}/bin/lazbuild --lazarusdir=${lazarus}/share/lazarus"' substituteInPlace install/linux/install.sh  --replace '$DC_INSTALL_PREFIX/usr' '$DC_INSTALL_PREFIX' ''; buildPhase = '' runHook preBuild export HOME=$(mktemp -d) ./build.sh release qt5 runHook postBuild ''; installPhase = '' runHook preInstall install/linux/install.sh -I $out runHook postInstall ''; meta = with lib; { homepage = "https://doublecmd.sourceforge.io/"; description = "Two-panel graphical file manager written in Pascal"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; }; } # TODO: deal with other platforms too </ins>
/* NOTE: fetchgit has one problem: git fetch only works for refs. <del> This is because fetching arbitrary (maybe dangling) commits may be a security risk </del> <ins> This is because fetching arbitrary (maybe dangling) commits creates garbage collection risks </ins> and checking whether a commit belongs to a ref is expensive. This may change in the future when some caching is added to git (?) Usually refs are either tags (refs/tags/*) or branches (refs/heads/*)
[[package]] name = "boto3" <del> version = "1.24.6" </del> <ins> version = "1.24.16" </ins> description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.7" [package.dependencies] <del> botocore = ">=1.27.6,<1.28.0" </del> <ins> botocore = ">=1.27.16,<1.28.0" </ins> jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.6.0,<0.7.0"
[metadata] lock-version = "1.1" <del> python-versions = "^3.8" content-hash = "57d7c155ae4259912291b1315f9c2fd6c918fad9ef54d1e8011f800b649f9647" </del> <ins> python-versions = "^3.9" content-hash = "781bb4378f4491b427372322c3ec71131ed7a28e0a166e0bc43969b016b5d926" </ins> [metadata.files] apache-libcloud = [