jiebi/CodeConvo huggingface dataset:
stdenv.mkDerivation rec { pname = "sqlite-analyzer"; <del> version = "3.32.2"; </del> <ins> version = "3.32.3"; </ins> src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; <del> sha256 = "1jqhs896cvp9l399mjpbv1x2qbfvq875l1vrgnl3zc4ffdjxs9z0"; </del> <ins> sha256 = "1fgmslzf013ry3a7g2vms7zyg24gs53gfj308r6ki4inbn3g04lk"; </ins> }; nativeBuildInputs = [ unzip ];
stdenv.mkDerivation rec { pname = "sqlite"; <del> version = "3.32.2"; </del> <ins> version = "3.32.3"; </ins> # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; <del> sha256 = "1130bcd70s2vlsq0d638pb5qrw9kwqvjswnp2dfypghx9hjz3gid"; </del> <ins> sha256 = "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3"; </ins> }; outputs = [ "bin" "dev" "out" ];
description = lib.mdDoc "Enable the XFCE screensaver."; }; }; <ins> environment.xfce.excludePackages = mkOption { default = []; example = literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]"; type = types.listOf types.package; description = lib.mdDoc "Which packages XFCE should exclude from the default environment"; }; </ins> }; config = mkIf cfg.enable { <del> environment.systemPackages = with pkgs.xfce // pkgs; [ </del> <ins> environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [ </ins> glib # for gsettings gtk3.out # gtk-update-icon-cache
programs.zsh.vteIntegration = mkDefault true; # Systemd services <del> systemd.packages = with pkgs.xfce; [ </del> <ins> systemd.packages = utils.removePackagesByName (with pkgs.xfce; [ </ins> xfce4-notifyd <del> ]; </del> <ins> ]) excludePackages; </ins> security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver; };
<ins> { config, lib, pkgs, ... }: with lib; let cfg = config.services.borgmatic; cfgfile = pkgs.writeText "config.yaml" (builtins.toJSON cfg.settings); in { options.services.borgmatic = { enable = mkEnableOption "borgmatic"; settings = mkOption { description = '' See https://torsion.org/borgmatic/docs/reference/configuration/ ''; type = types.submodule { freeformType = with lib.types; attrsOf anything; options.location = { source_directories = mkOption { type = types.listOf types.str; description = '' List of source directories to backup (required). Globs and tildes are expanded. ''; example = [ "/home" "/etc" "/var/log/syslog*" ]; }; repositories = mkOption { type = types.listOf types.str; description = '' Paths to local or remote repositories (required). Tildes are expanded. Multiple repositories are backed up to in sequence. Borg placeholders can be used. See the output of "borg help placeholders" for details. See ssh_command for SSH options like identity file or port. If systemd service is used, then add local repository paths in the systemd service file to the ReadWritePaths list. ''; example = [ "user@backupserver:sourcehostname.borg" "user@backupserver:{fqdn}" ]; }; }; }; }; }; config = mkIf cfg.enable { environment.systemPackages = [ pkgs.borgmatic ]; environment.etc."borgmatic/config.yaml".source = cfgfile; systemd.packages = [ pkgs.borgmatic ]; }; } </ins>
<ins> { borgbackup, coreutils, lib, python3Packages, systemd }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; version = "1.5.12"; src = python3Packages.fetchPypi { inherit pname version; sha256 = "sha256-XLbBJvNRmH8W9SnOjF7zUbazRYFCMW6SEO2wKN/2VTY="; }; checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; # - test_borgmatic_version_matches_news_version # The file NEWS not available on the pypi source, and this test is useless # - test_collect_configuration_run_summary_logs_outputs_merged_json_results # Upstream fixed in the next version, see # https://github.com/witten/borgmatic/commit/ea6cd53067435365a96786b006aec391714501c4 disabledTests = [ "test_borgmatic_version_matches_news_version" "test_collect_configuration_run_summary_logs_outputs_merged_json_results" ]; propagatedBuildInputs = with python3Packages; [ borgbackup colorama pykwalify ruamel_yaml requests setuptools ]; postInstall = '' mkdir -p $out/lib/systemd/system cp sample/systemd/borgmatic.timer $out/lib/systemd/system/ substitute sample/systemd/borgmatic.service  $out/lib/systemd/system/borgmatic.service  --replace /root/.local/bin/borgmatic $out/bin/borgmatic  --replace systemd-inhibit ${systemd}/bin/systemd-inhibit  --replace sleep ${coreutils}/bin/sleep ''; meta = with lib; { description = "Simple, configuration-driven backup software for servers and workstations"; homepage = "https://torsion.org/borgmatic/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ imlonghao ]; }; } </ins>
makeFlags = let arch = head (splitString "-" stdenv.system); <del> march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} </del> <ins> march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; aarch64 = "armv8-a"; }.${arch} </ins> or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better <del> cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} </del> <ins> cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch} </ins> or (throw "unsupported architecture: ${arch}"); <del> # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM # https://github.com/JuliaLang/julia/tree/master/deps/patches </del> in [ "ARCH=${arch}" "MARCH=${march}"
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; <del> julia_15 = callPackage ../development/compilers/julia/1.5.nix { </del> <ins> julia_15 = callPackage ../development/compilers/julia/1.5.nix { </ins> inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia_1 = julia_10; <del> julia = julia_1; </del> <ins> julia = julia_15; </ins> jwasm =  callPackage ../development/compilers/jwasm { };
optionalString config.security.pam.enableEcryptfs '' auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap '' + <ins> optionalString config.security.pam.enableFscrypt '' auth optional ${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so '' + </ins> optionalString cfg.pamMount '' auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive '' +
optionalString config.security.pam.enableEcryptfs '' password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so '' + <ins> optionalString config.security.pam.enableFscrypt '' password optional ${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so '' + </ins> optionalString cfg.pamMount '' password optional ${pkgs.pam_mount}/lib/security/pam_mount.so '' +
optionalString config.security.pam.enableEcryptfs '' session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so '' + <ins> optionalString config.security.pam.enableFscrypt '' # Work around https://github.com/systemd/systemd/issues/8598 # Skips the pam_fscrypt module for systemd-user sessions which do not have a password # anyways. # See also https://github.com/google/fscrypt/issues/95 session [success=1 default=ignore] pam_succeed_if.so service = systemd-user session optional ${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so '' + </ins> optionalString cfg.pamMount '' session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive '' +
}; security.pam.enableEcryptfs = mkEnableOption (lib.mdDoc "eCryptfs PAM module (mounting ecryptfs home directory on login)"); <ins> security.pam.enableFscrypt = mkEnableOption (lib.mdDoc '' Enables fscrypt to automatically unlock directories with the user's login password. This also enables a service at security.pam.services.fscrypt which is used by fscrypt to verify the user's password when setting up a new protector. If you use something other than pam_unix to verify user passwords, please remember to adjust this PAM service. ''); </ins> users.motd = mkOption { default = null;
++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] ++ optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ] ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ] <ins> ++ optionals config.security.pam.enableFscrypt [ pkgs.fscrypt-experimental ] </ins> ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ]; boot.supportedFilesystems = optionals config.security.pam.enableEcryptfs [ "ecryptfs" ];
optionalString config.security.pam.enableEcryptfs '' mr ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so, '' + <ins> optionalString config.security.pam.enableFscrypt '' mr ${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so, '' + </ins> optionalString (isEnabled (cfg: cfg.pamMount)) '' mr ${pkgs.pam_mount}/lib/security/pam_mount.so, '' +
ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; <ins> fscrypt = handleTest ./fscrypt.nix {}; </ins> ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; emacs-daemon = handleTest ./emacs-daemon.nix {};
<ins> import ./make-test-python.nix ({ ... }: { name = "fscrypt"; nodes.machine = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; security.pam.enableFscrypt = true; }; testScript = '' def login_as_alice(): machine.wait_until_tty_matches("1", "login: ") machine.send_chars("alicen") machine.wait_until_tty_matches("1", "Password: ") machine.send_chars("foobarn") machine.wait_until_tty_matches("1", "alice@machine") def logout(): machine.send_chars("logoutn") machine.wait_until_tty_matches("1", "login: ") machine.wait_for_unit("default.target") with subtest("Enable fscrypt on filesystem"): machine.succeed("tune2fs -O encrypt /dev/vda") machine.succeed("fscrypt setup --quiet --force --time=1ms") with subtest("Set up alice with an fscrypt-enabled home directory"): machine.succeed("(echo foobar; echo foobar) | passwd alice") machine.succeed("chown -R alice.users ~alice") machine.succeed("echo foobar | fscrypt encrypt --skip-unlock --source=pam_passphrase --user=alice /home/alice") with subtest("Create file as alice"): login_as_alice() machine.succeed("echo hello > /home/alice/world") logout() # Wait for logout to be processed machine.sleep(1) with subtest("File should not be readable without being logged in as alice"): machine.fail("cat /home/alice/world") with subtest("File should be readable again as alice"): login_as_alice() machine.succeed("cat /home/alice/world") logout() ''; }) </ins>
githubId = 16385648; name = "Niko Pavlinek"; }; <ins> nixbitcoin = { email = "nixbitcoin@i2pmail.org"; github = "nixbitcoin"; githubId = 45737139; name = "nixbitcoindev"; keys = [{ longkeyid = "rsa4096/0xDD11F9AD5308B3BA"; fingerprint = "577A 3452 7F3E 2A85 E80F  E164 DD11 F9AD 5308 B3BA"; }]; }; </ins> nixinator = { email = "33lockdown33@protonmail.com"; github = "nixinator";
<ins> { pkgs, buildGoModule, fetchFromGitHub, lib, perl }: buildGoModule rec { pname = "XD"; version = "0.4.0"; src = fetchFromGitHub { owner = "majestrate"; repo = "XD"; rev = "v${version}"; sha256 = "sha256-fXENoqhR04TYS/kAJUqsqa0+j+KyzdsMlXIZ2GMPMhc="; }; vendorSha256 = "1wg3cym2rwrhjsqlgd38l8mdq5alccz808465117n3vyga9m35lq"; checkInputs = [ perl ]; postInstall = '' ln -s $out/bin/XD $out/bin/XD-CLI ''; meta = with lib; { description = "i2p bittorrent client"; homepage = "https://xd-torrent.github.io"; maintainers = with maintainers; [ nixbitcoin ]; license = licenses.mit; platforms = platforms.linux; }; } </ins>
sha256 = "1nl4y1rwdl0gn67v7l05ibc4lwkn6x7fhwbmslmm08cqmwfjsx3y"; stripLen = 1; }) <ins> # fix build for "ZSTD_SOURCE=SYSTEM" (fetchpatch { url = "https://github.com/apache/arrow/commit/13cb3dbded1928d2e96574895bebaf9098a4796d.diff"; sha256 = "12z3ys47qp2x8f63lggiyj4xs2kmg804ri4xqysw5krbjz2hr6rb"; stripLen = 1; }) </ins> ] ++ lib.optionals (!enableShared) [ # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic. ./jemalloc-disable-shared.patch
"-DARROW_WITH_SNAPPY=ON" "-DARROW_WITH_ZLIB=ON" "-DARROW_WITH_ZSTD=ON" <ins> "-DARROW_ZSTD_USE_SHARED=OFF" # TODO use shared zstd once #91984 hits the master </ins> # Parquet options: "-DARROW_PARQUET=ON" "-DPARQUET_BUILD_EXECUTABLES=ON"
arrayfire = callPackage ../development/libraries/arrayfire {}; arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ <ins> # Workaround until #91984 is in, this will need to be removed later. zstd = zstd.override { enableShared = false; }; </ins> } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' });
setupHook = ./setup-hook.sh; passthru.updateScript = ./update.sh; <ins> passthru.tests = { # Test that building this derivation with a blacklist works, and that UTF-8 is supported. blacklist-utf8 = let blacklistCAToFingerprint = { # "blacklist" uses the CA name from the NSS bundle, but we check for presence using the SHA256 fingerprint. "CFCA EV ROOT" = "5C:C3:D7:8E:4E:1D:5E:45:54:7A:04:E6:87:3E:64:F9:0C:F9:53:6D:1C:CC:2E:F8:00:F3:55:C4:C5:FD:70:FD"; "NetLock Arany (Class Gold) Főtanúsítvány" = "6C:61:DA:C3:A2:DE:F0:31:50:6B:E0:36:D2:A6:FE:40:19:94:FB:D1:3D:F9:C8:D4:66:59:92:74:C4:46:EC:98"; }; mapBlacklist = f: concatStringsSep "n" (mapAttrsToList f blacklistCAToFingerprint); in runCommand "verify-the-cacert-filter-output" { cacert = cacert.unbundled; cacertWithExcludes = (cacert.override { blacklist = builtins.attrNames blacklistCAToFingerprint; }).unbundled; nativeBuildInputs = [ openssl ]; } '' isPresent() { # isPresent <unbundled-dir> <ca name> <ca sha256 fingerprint> for f in $1/etc/ssl/certs/*.crt; do fingerprint="$(openssl x509 -in "$f" -noout -fingerprint -sha256 | cut -f2 -d=)" if [[ "x$fingerprint" == "x$3" ]]; then return 0 fi done return 1 } # Ensure that each certificate is in the main "cacert". ${mapBlacklist (caName: caFingerprint: '' isPresent "$cacert" "${caName}" "${caFingerprint}" || ({ echo "CA fingerprint ${caFingerprint} (${caName}) is missing from the CA bundle. Consider picking a different CA for the blacklist test." >&2 exit 1 }) '')} # Ensure that each certificate is NOT in the "cacertWithExcludes". ${mapBlacklist (caName: caFingerprint: '' isPresent "$cacertWithExcludes" "${caName}" "${caFingerprint}" && ({ echo "CA fingerprint ${caFingerprint} (${caName}) is present in the cacertWithExcludes bundle." >&2 exit 1 }) '')} touch $out ''; }; </ins> meta = { homepage = "https://curl.haxx.se/docs/caextract.html"; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; <del> maintainers = with maintainers; [ fpletz ]; </del> <ins> maintainers = with maintainers; [ andir fpletz lukegb ]; </ins> license = licenses.mpl20; }; }
<del> --- a/certdata2pem.py	2017-08-01 23:10:00.000000000 +0300 +++ b/certdata2pem.py	2017-08-01 23:08:21.131297636 +0300 @@ -88,7 +88,7 @@ # Read blacklist. blacklist = [] if os.path.exists('blacklist.txt'): -    for line in open('blacklist.txt', 'r'): +    for line in io.open('blacklist.txt', 'r', encoding='utf-8'): line = line.strip() if line.startswith('#') or len(line) == 0: continue @@ -101,7 +101,7 @@ if obj['CKA_CLASS'] != 'CKO_NSS_TRUST': continue if obj['CKA_LABEL'] in blacklist: -        print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL']) +        print("Certificate %s blacklisted, ignoring." % unicode(obj['CKA_LABEL']).encode('utf-8')) elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR': trust[obj['CKA_LABEL']] = True elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR': </del>
<del> { lib, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio }: </del> <ins> { stdenv, file, fetchFromGitLab, buildPerlPackage, ArchiveZip, ArchiveCpio, shortenPerlShebang }: </ins> buildPerlPackage rec { pname = "strip-nondeterminism";
rm $out/share/man/man1/dh_strip_nondeterminism.1.gz ''; <del> meta = with lib; { </del> <ins> postInstall = stdenv.lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/strip-nondeterminism ''; meta = with stdenv.lib; { </ins> description = "A Perl module for stripping bits of non-deterministic information"; homepage = "https://reproducible-builds.org/"; license = licenses.gpl3;
services.dhcpd4 = { enable = true; interfaces = map (n: "eth${toString n}") vlanIfs; <del> extraConfig = '' '' + flip concatMapStrings vlanIfs (n: '' </del> <ins> extraConfig = flip concatMapStrings vlanIfs (n: '' </ins> subnet 192.168.${toString n}.0 netmask 255.255.255.0 { option routers 192.168.${toString n}.1; <ins> range 192.168.${toString n}.2 192.168.${toString n}.254; </ins> } '') ; <del> machines = lib.flip map vlanIfs (vlan: </del> <ins> machines = flip map vlanIfs (vlan: </ins> { hostName = "client${toString vlan}"; ethernetAddress = qemu-flags.qemuNicMac vlan 1;
buildGoPackage rec { pname = "singularity"; <del> version = "3.2.1"; </del> <ins> version = "3.6.1"; </ins> <del> src = fetchFromGitHub { owner = "sylabs"; repo = "singularity"; rev = "v${version}"; sha256 = "14lhxwy21s7q081x7kbnvkjsbxgsg2f181qlzmlxcn6n7gfav3kj"; </del> <ins> src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; sha256 = "070jj6kbiw23sd2p4xhvmyb8gd83imwgisdf18ahkwp7dq85db3c"; </ins> }; goPackagePath = "github.com/sylabs/singularity"; goDeps = ./deps.nix; <del> buildInputs = [ openssl ]; nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ]; </del> <ins> buildInputs = [ gpgme openssl libuuid ]; nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper cryptsetup ]; </ins> propagatedBuildInputs = [ coreutils squashfsTools ]; <del> prePatch = '' substituteInPlace internal/pkg/build/copy/copy.go  </del> <ins> postPatch = '' substituteInPlace internal/pkg/build/files/copy.go  </ins> --replace /bin/cp ${coreutils}/bin/cp '';
# Don't install SUID binaries sed -i 's/-m 4755/-m 755/g' builddir/Makefile ''; buildPhase = '' <ins> runHook preBuild </ins> make -C builddir <ins> runHook postBuild </ins> ''; installPhase = '' <ins> runHook preInstall </ins> make -C builddir install LOCALSTATEDIR=$bin/var chmod 755 $bin/libexec/singularity/bin/starter-suid <del> wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} </del> <ins> # Explicitly configure paths in the config file sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${stdenv.lib.makeBinPath [squashfsTools]}/mksquashfs|' $bin/etc/singularity/singularity.conf sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${stdenv.lib.makeBinPath [cryptsetup]}/cryptsetup|' $bin/etc/singularity/singularity.conf runHook postInstall </ins> ''; postFixup = '' <del> find $bin/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true # These etc scripts shouldn't have their paths patched cp etc/actions/* $bin/etc/singularity/actions/ </del> <ins> find $bin/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true </ins> ''; meta = with stdenv.lib; { <del> homepage = http://www.sylabs.io/; </del> <ins> homepage = "http://www.sylabs.io/"; </ins> description = "Application containers for linux"; license = licenses.bsd3; platforms = platforms.linux;
{ stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 <del> , libxml2, libglade, intltool, xorg, makeWrapper, gle </del> <ins> , libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib </ins> , forceInstallAllHacks ? false }:
buildInputs = [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender <del> libXxf86misc intltool xorg.appres makeWrapper gle </del> <ins> libXxf86misc intltool xorg.appres makeWrapper gle gdk-pixbuf gdk-pixbuf-xlib </ins> ]; preConfigure =
enable = true; virtualHosts = mapAttrs (hostName: cfg:  mkMerge [ cfg.nginx { root = mkForce "${pkg hostName cfg}/share/dokuwiki"; <del> extraConfig = "fastcgi_param HTTPS on;"; </del> <ins> extraConfig = lib.optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"; </ins> locations."~ /(conf/|bin/|inc/|install.php)" = { extraConfig = "deny all;";
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param REDIRECT_STATUS 200; fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket}; <del> fastcgi_param HTTPS on; </del> <ins> ${lib.optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"} </ins> ''; }; }]) eachSite;
postFixup = '' # Remove references to bootstrap. find "$out" -name *.so | while read lib; do <del> new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11_headless}[^:]*,,')" </del> <ins> new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${lib.escape ["+"] openjdk11_headless.outPath}[^:]*,,')" </ins> patchelf --set-rpath "$new_refs" "$lib" done '';
{ callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 <del> , systemd, valgrind, xcbuild </del> <ins> , systemd, system-sendmail, valgrind, xcbuild </ins> , version , sha256
++ lib.optional systemdSupport "--with-fpm-systemd" ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" ++ lib.optional ztsSupport "--enable-maintainer-zts" <ins> # Sendmail ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] </ins> ; hardeningDisable = [ "bindnow" ];
"-Dtests=false" "-Dtracker3=${lib.boolToString trackerSupport}" "-Dbroadway_backend=${lib.boolToString broadwaySupport}" <ins> "-Dx11_backend=${lib.boolToString x11Support}" "-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}" </ins> ]; doCheck = false; # needs X11
NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' <ins> # See https://github.com/NixOS/nixpkgs/issues/132259 substituteInPlace meson.build  --replace "x11_enabled = false" "" </ins> files=( build-aux/meson/post-install.py demos/gtk-demo/geninclude.py
<ins> { lib, buildGoModule, fetchFromGitHub, glibc, go-md2man, installShellFiles }: buildGoModule rec { pname = "toolbox"; version = "0.0.99.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; hash = "sha256-9HiWgEtaMypLOwXJ6Xg3grLSZOQ4NInZtcvLPV51YO8="; }; patches = [ ./glibc.patch ]; vendorHash = "sha256-k79TcC9voQROpJnyZ0RsqxJnBT83W5Z+D+D3HnuQGsI="; postPatch = '' substituteInPlace src/cmd/create.go --subst-var-by glibc ${glibc} ''; modRoot = "src"; nativeBuildInputs = [ go-md2man installShellFiles ]; ldflags = [ "-s" "-w" "-X github.com/containers/toolbox/pkg/version.currentVersion=${version}" ]; preCheck = "export PATH=$GOPATH/bin:$PATH"; postInstall = '' cd .. for d in doc/*.md; do go-md2man -in $d -out ''${d%.md} done installManPage doc/*.[1-9] installShellCompletion --bash completion/bash/toolbox install profile.d/toolbox.sh -Dt $out/share/profile.d ''; meta = with lib; { homepage = "https://containertoolbx.org"; changelog = "https://github.com/containers/toolbox/releases/tag/${version}"; description = "Tool for containerized command line environments on Linux"; license = licenses.asl20; maintainers = with maintainers; [ urandom ]; }; } </ins>
<ins> diff --git a/src/cmd/create.go b/src/cmd/create.go index 74e90b1..113ef80 100644 --- a/src/cmd/create.go +++ b/src/cmd/create.go @@ -423,6 +425,7 @@ func createContainer(container, image, release string, showCommandToEnter bool) "--volume", toolboxPathMountArg, "--volume", usrMountArg, "--volume", runtimeDirectoryMountArg, +		"--volume", "@glibc@:@glibc@:ro", }...) createArgs = append(createArgs, avahiSocketMount...) </ins>