Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299		2019-08-24 08:55:37 +02:00
..
build-runtime.py
build-wrapped.sh
chrootenv.nix	steam: fix for screeps	2019-08-12 02:52:51 +02:00
default.nix	steamcmd: init at 20180104	2018-09-08 13:39:32 -07:00
fonts.nix
runtime-generated.nix	steam: Update dependencies for steamrt	2019-08-19 01:15:34 +03:00
runtime-mirror.nix
runtime-wrapped.nix	steamPackages.steam-runtime-wrapped: don't include all of gcc	2018-11-05 22:46:53 +00:00
runtime.nix	treewide: Depend on stdenv.cc.bintools instead of binutils directly	2017-11-05 17:10:53 -05:00
steam.nix	treewide: name -> pname	2019-08-17 10:54:38 +00:00
steamcmd.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
steamcmd.sh	steamcmd: Add needed binaries to PATH	2019-03-29 21:41:14 +01:00
update-runtime-shell.nix
update-runtime.py	steamrt: fix update script	2019-04-19 18:23:34 +02:00