pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #274409 from K900/unblock-channels

Unblock channels

authored by K900 and committed by GitHub 02357add 39bbee99

+3 -2
unified split
+2 -2
nixos/modules/config/ldso.nix
··· 4 inherit (lib) last splitString mkOption types mdDoc optionals; 5 6 libDir = pkgs.stdenv.hostPlatform.libDir; 7 - ldsoBasename = last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker); 8 9 pkgs32 = pkgs.pkgsi686Linux; 10 libDir32 = pkgs32.stdenv.hostPlatform.libDir; 11 - ldsoBasename32 = last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker); 12 in { 13 options = { 14 environment.ldso = mkOption {
··· 4 inherit (lib) last splitString mkOption types mdDoc optionals; 5 6 libDir = pkgs.stdenv.hostPlatform.libDir; 7 + ldsoBasename = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker)); 8 9 pkgs32 = pkgs.pkgsi686Linux; 10 libDir32 = pkgs32.stdenv.hostPlatform.libDir; 11 + ldsoBasename32 = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker)); 12 in { 13 options = { 14 environment.ldso = mkOption {
+1
nixos/tests/containers-imperative.nix
··· 13 nix.settings.sandbox = false; 14 nix.settings.substituters = []; # don't try to access cache.nixos.org 15 16 virtualisation.writableStore = true; 17 # Make sure we always have all the required dependencies for creating a 18 # container available within the VM, because we don't have network access.
··· 13 nix.settings.sandbox = false; 14 nix.settings.substituters = []; # don't try to access cache.nixos.org 15 16 + virtualisation.memorySize = 2048; 17 virtualisation.writableStore = true; 18 # Make sure we always have all the required dependencies for creating a 19 # container available within the VM, because we don't have network access.