jiebi/CodeConvo huggingface dataset:
<ins> From 715c5f461b4992dac066601202a673bc551a5e33 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sun, 16 Feb 2020 14:23:31 -0600 Subject: [PATCH 1/4] kinit-libpath --- src/kdeinit/kinit.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp index 8fff17a..0801b75 100644 --- a/src/kdeinit/kinit.cpp +++ b/src/kdeinit/kinit.cpp @@ -622,19 +622,15 @@ static pid_t launch(int argc, const char *_name, const char *args, if (!libpath.isEmpty()) { if (libpath_relative) { -                // NB: Because Qt makes the actual dlopen() call, the -                //     RUNPATH of kdeinit is *not* respected - see -                //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -                //     - so we try hacking it in ourselves -                QString install_lib_dir = QFile::decodeName( -                        CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -                QString orig_libpath = libpath; -                libpath = install_lib_dir + libpath; -                l.setFileName(libpath); -                if (!l.load()) { -                    libpath = orig_libpath; -                    l.setFileName(libpath); -                    l.load(); +                // Try to load the library relative to the active profiles. +                QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); +                // Reverse the profile list. +                std::reverse(profiles.begin(), profiles.end()); +                for (const QByteArray &profile: profiles) { +                    if (!profile.isEmpty()) { +                        l.setFileName(QFile::decodeName(profile) + QStringLiteral("/lib/") + libpath); +                        if (l.load()) break; +                    } } } else { l.load(); -- 2.23.1 </ins>
<ins> From 129cd0ae1e983adc10dbe84e87bcc6f31cb13db8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sun, 16 Feb 2020 14:23:44 -0600 Subject: [PATCH 2/4] start_kdeinit-path --- src/start_kdeinit/start_kdeinit_wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/start_kdeinit/start_kdeinit_wrapper.c b/src/start_kdeinit/start_kdeinit_wrapper.c index 891f50c..ef664ad 100644 --- a/src/start_kdeinit/start_kdeinit_wrapper.c +++ b/src/start_kdeinit/start_kdeinit_wrapper.c @@ -23,7 +23,7 @@ #include <string.h> #include <unistd.h> -#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" +#define EXECUTE "/run/wrappers/bin/start_kdeinit" #if KDEINIT_OOM_PROTECT -- 2.23.1 </ins>
<ins> From 4f5d0de7e35744cdbfa9e280ee7e15a54cf21abb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Sun, 16 Feb 2020 14:24:07 -0600 Subject: [PATCH 3/4] kdeinit-extra-libs --- src/kdeinit/kinit.cpp | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp index 0801b75..622dd5f 100644 --- a/src/kdeinit/kinit.cpp +++ b/src/kdeinit/kinit.cpp @@ -96,9 +96,9 @@ static const char *extra_libs[] = { "libKF5Parts.5.dylib", "libKF5Plasma.5.dylib" #else -    "libKF5KIOCore.so.5", -    "libKF5Parts.so.5", -    "libKF5Plasma.so.5" +    NIXPKGS_KF5_KIOCORE, +    NIXPKGS_KF5_PARTS, +    NIXPKGS_KF5_PLASMA #endif }; #endif @@ -1524,20 +1524,6 @@ static int initXconnection() } #endif -#ifndef Q_OS_OSX -// Find a shared lib in the lib dir, e.g. libkio.so. -// Completely unrelated to plugins. -static QString findSharedLib(const QString &lib) -{ -    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; -    if (QFile::exists(path)) { -        return path; -    } -    // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes? -    return QString(); -} -#endif - extern "C" { static void secondary_child_handler(int) @@ -1679,7 +1665,7 @@ int main(int argc, char **argv) #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { for (const char *extra_lib : extra_libs) { -            const QString extra = findSharedLib(QString::fromLatin1(extra_lib)); +            const QString extra = QString::fromLatin1(extra_lib); if (!extra.isEmpty()) { QLibrary l(extra); l.setLoadHints(QLibrary::ExportExternalSymbolsHint); -- 2.23.1 </ins>
<ins> From 41e94983dcfbc1667f1b18c5b566aa5c5975edcb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Mon, 17 Feb 2020 04:45:03 -0600 Subject: [PATCH 4/4] start_kdeinit-environ-hard-limit --- src/start_kdeinit/start_kdeinit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/start_kdeinit/start_kdeinit.c b/src/start_kdeinit/start_kdeinit.c index f2db3e9..4ff2602 100644 --- a/src/start_kdeinit/start_kdeinit.c +++ b/src/start_kdeinit/start_kdeinit.c @@ -148,7 +148,11 @@ int main(int argc, char **argv) ++i) { unsigned len; if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned) -                            && len && len < (1 << 12)) { +                            && len) { +                        if (len >= (1 << 14)) { +                            fprintf(stderr, "%s: exceeded environment length limit", argv[0]); +                            return 1; +                        } env[ i ] = malloc(len + 1); if ((unsigned) read(0, env[ i ], len) == len) { env[ i ][ len ] = '0'; -- 2.23.1 </ins>
buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem ]; <del> patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); </del> <ins> patches = [ ./0001-kinit-libpath.patch ./0002-start_kdeinit-path.patch ./0003-kdeinit-extra-libs.patch ./0004-start_kdeinit-environ-hard-limit.patch ]; </ins> CXXFLAGS = [ ''-DNIXPKGS_KF5_KIOCORE="${getLib kio}/lib/libKF5KIOCore.so.5"'' ''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"''
<del> Index: kinit-5.32.0/src/kdeinit/kinit.cpp =================================================================== --- kinit-5.32.0.orig/src/kdeinit/kinit.cpp +++ kinit-5.32.0/src/kdeinit/kinit.cpp @@ -96,9 +96,9 @@ static const char *extra_libs[] = { "libKF5Parts.5.dylib", "libKF5Plasma.5.dylib" #else -    "libKF5KIOCore.so.5", -    "libKF5Parts.so.5", -    "libKF5Plasma.so.5" +    NIXPKGS_KF5_KIOCORE, +    NIXPKGS_KF5_PARTS, +    NIXPKGS_KF5_PLASMA #endif }; #endif @@ -1533,20 +1531,6 @@ static int initXconnection() } #endif -#ifndef Q_OS_OSX -// Find a shared lib in the lib dir, e.g. libkio.so. -// Completely unrelated to plugins. -static QString findSharedLib(const QString &lib) -{ -    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib; -    if (QFile::exists(path)) { -        return path; -    } -    // We could also look in LD_LIBRARY_PATH, but really, who installs the main libs in different prefixes? -    return QString(); -} -#endif - extern "C" { static void secondary_child_handler(int) @@ -1692,7 +1676,7 @@ int main(int argc, char **argv) if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) { for (const char *extra_lib : extra_libs) { -            const QString extra = findSharedLib(QString::fromLatin1(extra_lib)); +            const QString extra = QString::fromLatin1(extra_lib); if (!extra.isEmpty()) { QLibrary l(extra); l.setLoadHints(QLibrary::ExportExternalSymbolsHint); </del>
<del> Index: kinit-5.32.0/src/kdeinit/kinit.cpp =================================================================== --- kinit-5.32.0.orig/src/kdeinit/kinit.cpp +++ kinit-5.32.0/src/kdeinit/kinit.cpp @@ -623,19 +623,15 @@ static pid_t launch(int argc, const char if (!libpath.isEmpty()) { if (libpath_relative) { -                // NB: Because Qt makes the actual dlopen() call, the -                //     RUNPATH of kdeinit is *not* respected - see -                //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -                //     - so we try hacking it in ourselves -                QString install_lib_dir = QFile::decodeName( -                        CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -                QString orig_libpath = libpath; -                libpath = install_lib_dir + libpath; -                l.setFileName(libpath); -                if (!l.load()) { -                    libpath = orig_libpath; -                    l.setFileName(libpath); -                    l.load(); +                // Try to load the library relative to the active profiles. +                QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); +                // Reverse the profile list. +                std::reverse(profiles.begin(), profiles.end()); +                for (const QByteArray &profile: profiles) { +                    if (!profile.isEmpty()) { +                        l.setFileName(QFile::decodeName(profile) + QStringLiteral("/lib/") + libpath); +                        if (l.load()) break; +                    } } } else { l.load(); </del>
<del> Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c =================================================================== --- kinit-5.24.0.orig/src/start_kdeinit/start_kdeinit_wrapper.c +++ kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c @@ -23,7 +23,7 @@ #include <string.h> #include <unistd.h> -#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit" +#define EXECUTE "/run/wrappers/bin/start_kdeinit" #if KDEINIT_OOM_PROTECT </del>
postPatch = let darwinPatches = '' <ins> bazelLinkFlags () { eval set -- "$NIX_LDFLAGS" local flag for flag in "$@"; do printf ' -Wl,%s' "$flag" done } </ins> # Disable Bazel's Xcode toolchain detection which would configure compilers # and linkers from Xcode instead of from PATH export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
# Framework search paths aren't added by bintools hook # https://github.com/NixOS/nixpkgs/pull/41914 <del> export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" </del> <ins> export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" </ins> # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" # don't use system installed Xcode to run clang, use Nix clang instead <del> sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g"  </del> <ins> sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g"  </ins> scripts/bootstrap/compile.sh  src/tools/xcode/realpath/BUILD  src/tools/xcode/stdredirect/BUILD
{ stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let <del> versionMajor = "6.9"; versionMinor = "2"; </del> <ins> versionMajor = "6.10"; versionMinor = "12"; </ins> versionBuild_x86_64 = "1"; versionBuild_i686 = "1"; in stdenv.mkDerivation rec { pname = "nomachine-client"; version = "${versionMajor}.${versionMinor}"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; <del> sha256 = "1z2pcfkzicjma4lxrj4qx43xyml993v7qyjd7k8xy8hw85fwnzii"; </del> <ins> sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01"; </ins> } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; <del> sha256 = "03421s0k91c02ga9k6bdvixw71brlgi13q82cinnfayg3fhb0rb6"; </del> <ins> sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg"; </ins> } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; postUnpack = '' mv $(find . -type f -name nxclient.tar.gz) . mv $(find . -type f -name nxplayer.tar.gz) .
{ stdenv, fetchFromGitHub }: <ins> /* This derivation is impure: it relies on an Xcode toolchain being installed and available in the expected place. The values of sandboxProfile are copied pretty directly from the MacVim derivation, which is also impure. In order to build you at least need the `sandbox` option set to `relaxed` or `false`. */ </ins> stdenv.mkDerivation rec { pname = "iterm2"; <del> version = "3.0.14"; </del> <ins> version = "3.3.9"; </ins> src = fetchFromGitHub { owner = "gnachman"; repo = "iTerm2"; rev = "v${version}"; <del> sha256 = "03m0ja11w9910z96yi8fzq3436y8xl14q031rdb2w3sapjd54qrj"; </del> <ins> sha256 = "06mq3gfjgy8jw2f3fzdsi3pbfkdijfzzlhlw6ixa5bfb4hbcgn5j"; </ins> }; patches = [ ./disable_updates.patch ]; postPatch = '' sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj ''; preConfigure = "LD=$CC"; <del> makeFlagsArray = ["Deployment"]; </del> <ins> makeFlagsArray = ["Nix"]; </ins> installPhase = '' <del> mkdir -p "$out/Applications" mv "build/Deployment/iTerm2.app" "$out/Applications/iTerm.app" </del> <ins> mkdir -p $out/Applications mv Build/Products/Deployment/iTerm2.app $out/Applications/iTerm.app ''; sandboxProfile = '' (allow file-read* file-write* process-exec mach-lookup) ; block homebrew dependencies (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) </ins> ''; <del> meta = { </del> <ins> meta = with stdenv.lib; { </ins> description = "A replacement for Terminal and the successor to iTerm"; homepage = https://www.iterm2.com/; <del> license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.darwin; </del> <ins> license = licenses.gpl2; maintainers = with maintainers; [ tricktron ]; platforms = platforms.darwin; hydraPlatforms = []; </ins> }; }
1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/certbot/setup.py b/certbot/setup.py <del> index c1bf914..7456bf2 100644 </del> <ins> index d19327e5e..ac1524793 100644 </ins> --- a/certbot/setup.py +++ b/certbot/setup.py <del> @@ -3,7 +3,6 @@ import os </del> <ins> @@ -1,5 +1,4 @@ import codecs -from distutils.version import StrictVersion import os </ins> import re import sys <del> -from distutils.version import StrictVersion from setuptools import find_packages, setup, __version__ as setuptools_version from setuptools.command.test import test as TestCommand @@ -56,20 +55,8 @@ install_requires = [ </del> <ins> @@ -58,20 +57,8 @@ install_requires = [ </ins> # Add pywin32 on Windows platforms to handle low-level system calls. # This dependency needs to be added using environment markers to avoid its installation on Linux.
<del> { stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook }: </del> <ins> { lib , buildPythonApplication , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, mock, gnureadline , pytest_xdist, pytest, dateutil }: </ins> <del> python37Packages.buildPythonApplication rec { </del> <ins> buildPythonApplication rec { </ins> pname = "certbot"; <del> version = "1.0.0"; </del> <ins> version = "1.3.0"; </ins> src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; <del> sha256 = "180x7gcpfbrzw8k654s7b5nxdy2yg61lq513dykyn3wz4gssw465"; </del> <ins> sha256 = "1nzp1l63f64qqp89y1vyd4lgfhykfp5dkr6iwfiyf273y7sjwpsa"; </ins> }; patches = [ ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch ]; <del> propagatedBuildInputs = with python37Packages; [ </del> <ins> propagatedBuildInputs = [ </ins> ConfigArgParse acme configobj
distro josepy parsedatetime <del> psutil </del> pyRFC3339 pyopenssl pytz <ins> requests </ins> six zope_component zope_interface ]; <del> buildInputs = [ dialog ] ++ (with python37Packages; [ mock gnureadline ]); </del> <ins> buildInputs = [ dialog mock gnureadline ]; </ins> <del> checkInputs = with python37Packages; [ pytest_xdist pytest dateutil ]; </del> <ins> checkInputs = [ pytest_xdist pytest dateutil ]; </ins> <del> postPatch = '' </del> <ins> preBuild = '' </ins> cd certbot <del> substituteInPlace certbot/_internal/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" </del> ''; postInstall = ''
doCheck = true; <del> meta = with stdenv.lib; { </del> <ins> meta = with lib; { </ins> homepage = src.meta.homepage; description = "ACME client that can obtain certs and extensibly update server configurations"; platforms = platforms.unix; <del> maintainers = [ maintainers.domenkozar ]; license = licenses.asl20; </del> <ins> maintainers = with maintainers; [ domenkozar ]; license = with licenses; [ asl20 ]; </ins> }; }
evalModules) and the less declarative the module set is. */ evalModules = { modules , prefix ? [] <ins> , # This should only be used for special arguments that need to be evaluated # when resolving module structure (like in imports). For everything else, # there's _module.args. specialArgs ? {} </ins> , # This would be remove in the future, Prefer _module.args option instead. args ? {} , # This would be remove in the future, Prefer _module.check option instead.
config = removeAttrs m ["key" "_file" "require" "imports"]; }; <del> applyIfFunction = f: arg@{ config, options, lib }: if isFunction f then </del> <ins> applyIfFunction = f: arg@{ config, options, lib, ... }: if isFunction f then </ins> let # Module arguments are resolved in a strict manner when attribute set # deconstruction is used.  As the arguments are now defined with the
install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" <del> install_name_tool -change "$oldPath" "$newPath" "$out/${perl.libPrefix}/${perl.version}/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" </del> <ins> install_name_tool -change "$oldPath" "$newPath" "$out/${perl.libPrefix}/${perl.version}/darwin"*"-2level/auto/Text/BibTeX/BibTeX.bundle" </ins> ''; meta = { description = "Interface to read and parse BibTeX files";
</listitem> <listitem> <para> <ins> Haskell <varname>env</varname> and <varname>shellFor</varname> dev shell environments now organized dependencies the same way as regular builds. In particular, rather than receiving all the different lists of dependencies master together as one big lists, and then partitioning into Haskell and non-Hakell dependencies, they work from the original many different dependency parameters and don't need to algorithmically partition anything. </para> <para> This means that if you incorrectly categorize a dependency, e.g. non-Haskell library dependency as a <varname>buildDepends</varname> or run-time Haskell dependency as a <varname>setupDepends</varname>, whereas things would have worked before they may not work now. </para> </listitem> <listitem> <para> </ins> The <package>gcc-snapshot</package>-package has been removed. It's marked as broken for &gt;2 years and used to point to a fairly old snapshot  from the <package>gcc7</package>-branch. </para>
<ins> { stdenv, pkgs, lib , libXNVCtrl }: let mangohud_64 = pkgs.callPackage ./default.nix { inherit libXNVCtrl; }; mangohud_32 = pkgs.pkgsi686Linux.callPackage ./default.nix { inherit libXNVCtrl; }; in pkgs.buildEnv rec { name = "mangohud-${mangohud_64.version}"; paths = [ mangohud_32 ] ++ lib.optionals stdenv.is64bit [ mangohud_64 ]; meta = mangohud_64.meta; } </ins>
<ins> { stdenv , lib , fetchFromGitHub , fetchpatch , meson , ninja , pkg-config , python3Packages , dbus , glslang , libglvnd , libXNVCtrl , mesa , vulkan-headers , vulkan-loader , xorg }: stdenv.mkDerivation rec { pname = "mangohud${lib.optionalString stdenv.is32bit "_32"}"; version = "0.4.1"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "v${version}"; sha256 = "04v2ps8n15ph2smjgnssax5hq88bszw2kbcff37cnd5c8yysvfi6"; fetchSubmodules = true; }; patches = [ (fetchpatch { # FIXME obsolete in >=0.5.0 url = "https://patch-diff.githubusercontent.com/raw/flightlessmango/MangoHud/pull/208.patch"; sha256 = "1i6x6sr4az1zv0p6vpw99n947c7awgbbv087fghjlczhry676nmh"; }) ]; mesonFlags = [ "-Dappend_libdir_mangohud=false" "-Duse_system_vulkan=enabled" "--libdir=lib${lib.optionalString stdenv.is32bit "32"}" ]; buildInputs = [ dbus glslang libglvnd libXNVCtrl mesa python3Packages.Mako vulkan-headers vulkan-loader xorg.libX11 ]; nativeBuildInputs = [ meson ninja pkg-config python3Packages.Mako python3Packages.python ]; preConfigure = '' mkdir -p "$out/share/vulkan/" ln -sf "${vulkan-headers}/share/vulkan/registry/" $out/share/vulkan/ ln -sf "${vulkan-headers}/include" $out ''; meta = with lib; { description = "A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more"; homepage = "https://github.com/flightlessmango/MangoHud"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ zeratax ]; }; } </ins>
User = data.user; Group = data.group; PrivateTmp = true; <del> StateDirectory = "acme/.lego/${cert} ${lpath}"; </del> <ins> StateDirectory = "acme/.lego/${cert} acme/.lego/accounts ${lpath}"; </ins> StateDirectoryMode = if data.allowKeysForGroup then "750" else "700"; WorkingDirectory = spath; # Only try loading the credentialsFile if the dns challenge is enabled EnvironmentFile = if data.dnsProvider != null then data.credentialsFile else null; ExecStart = pkgs.writeScript "acme-start" '' #!${pkgs.runtimeShell} -e <ins> test -L ${spath}/accounts -o -d ${spath}/accounts || ln -s ../accounts ${spath}/accounts </ins> ${pkgs.lego}/bin/lego ${renewOpts} || ${pkgs.lego}/bin/lego ${runOpts} ''; ExecStartPost =
users.users.systemd-network.group = "systemd-network"; systemd.additionalUpstreamSystemUnits = [ <del> "systemd-networkd.service" "systemd-networkd-wait-online.service" </del> <ins> "systemd-networkd-wait-online.service" "systemd-networkd.service" "systemd-networkd.socket" </ins> ]; systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks; <ins> # systemd-networkd is socket-activated by kernel netlink route change # messages. It is important to have systemd buffer those on behalf of # networkd. systemd.sockets.systemd-networkd.wantedBy = [ "sockets.target" ]; </ins> systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; <ins> aliases = [ "dbus-org.freedesktop.network1.service" ]; </ins> restartTriggers = map (x: x.source) (attrValues unitFiles); # prevent race condition with interface renaming (#39069) requires = [ "systemd-udev-settle.service" ];
"19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1"; "19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06"; <del> latest = self."19.09"; </del> <ins> # 20.03.1554.94e39623a49 "20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013"; "20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1"; "20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd"; "20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c"; "20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b"; "20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85"; "20.03".us-east-2.hvm-ebs = "ami-030296bb256764655"; "20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741"; "20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2"; "20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7"; "20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7"; "20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd"; "20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c"; "20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45"; "20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d"; "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86"; "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d"; latest = self."20.03"; </ins> }; in self