public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/tools/networking/xh/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-22 18:19:10 -07:00
parent 563389a7fd 6543c61311
commit 11a9ac00fc
157 changed files with 1479 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
View File

@@ -1,9 +1,7 @@
{ stdenv, pkgs, cores, runtimeShell }:
{ stdenv, pkgs, lib, cores, runtimeShell }:
assert cores != [];
with pkgs.lib;
let
script = exec: ''