Unverified Commit 02357add authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #274409 from K900/unblock-channels 

Unblock channels
parents 39bbee99 1950eec4

nixos/modules/config/ldso.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ let 
  inherit (lib) last splitString mkOption types mdDoc optionals;



  libDir = pkgs.stdenv.hostPlatform.libDir;

  ldsoBasename = last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker);

  ldsoBasename = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker));



  pkgs32 = pkgs.pkgsi686Linux;

  libDir32 = pkgs32.stdenv.hostPlatform.libDir;

  ldsoBasename32 = last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker);

  ldsoBasename32 = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker));

in {

  options = {

    environment.ldso = mkOption {

nixos/tests/containers-imperative.nix

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
      nix.settings.sandbox = false;

      nix.settings.substituters = []; # don't try to access cache.nixos.org



      virtualisation.memorySize = 2048;

      virtualisation.writableStore = true;

      # Make sure we always have all the required dependencies for creating a

      # container available within the VM, because we don't have network access.