diff options
| author | K900 <me@0upti.me> | 2023-12-15 13:23:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 13:23:40 +0300 |
| commit | 02357adddd0889782362d999628de9d309d202dc (patch) | |
| tree | 44e735d3c60c542b379c1e32970b7ab859790c47 | |
| parent | 39bbee99ffc7e2f0c34c395beb7f6a699230d5af (diff) | |
| parent | 1950eec4aa7bbae7097b7da5b72a04268b9a596b (diff) | |
| download | nixlib-02357adddd0889782362d999628de9d309d202dc.tar nixlib-02357adddd0889782362d999628de9d309d202dc.tar.gz nixlib-02357adddd0889782362d999628de9d309d202dc.tar.bz2 nixlib-02357adddd0889782362d999628de9d309d202dc.tar.lz nixlib-02357adddd0889782362d999628de9d309d202dc.tar.xz nixlib-02357adddd0889782362d999628de9d309d202dc.tar.zst nixlib-02357adddd0889782362d999628de9d309d202dc.zip | |
Merge pull request #274409 from K900/unblock-channels
Unblock channels
| -rw-r--r-- | nixos/modules/config/ldso.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/containers-imperative.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/config/ldso.nix b/nixos/modules/config/ldso.nix index e5ae13a21145..72ae3958d886 100644 --- a/nixos/modules/config/ldso.nix +++ b/nixos/modules/config/ldso.nix @@ -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 { diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 18bec1db78e8..fff00e4f73a8 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -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. |