diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-15 00:40:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 00:40:27 +0000 |
| commit | 8fa4dca9b52e70fdf1f7a0c3b405b3d9a6f7359b (patch) | |
| tree | d6f3f8ec0062629a292ac512d0e994b6c5b8aebc /pkgs/games | |
| parent | c7b23f6440cf3ec6a0600e1c70da94bcdf3a2375 (diff) | |
| parent | 4908c65935d34a50a5736f31b0ebee60e39a29d5 (diff) | |
| download | nixpkgs-8fa4dca9b52e70fdf1f7a0c3b405b3d9a6f7359b.tar nixpkgs-8fa4dca9b52e70fdf1f7a0c3b405b3d9a6f7359b.tar.gz nixpkgs-8fa4dca9b52e70fdf1f7a0c3b405b3d9a6f7359b.tar.bz2 nixpkgs-8fa4dca9b52e70fdf1f7a0c3b405b3d9a6f7359b.tar.lz nixpkgs-8fa4dca9b52e70fdf1f7a0c3b405b3d9a6f7359b.tar.xz nixpkgs-8fa4dca9b52e70fdf1f7a0c3b405b3d9a6f7359b.tar.zst nixpkgs-8fa4dca9b52e70fdf1f7a0c3b405b3d9a6f7359b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/factorio/versions.json | 24 | ||||
| -rw-r--r-- | pkgs/games/steam/fhsenv.nix | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index b38069355ee..1f8b2010226 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.27" }, "stable": { - "name": "factorio_alpha_x64-1.1.26.tar.xz", + "name": "factorio_alpha_x64-1.1.27.tar.xz", "needsAuth": true, - "sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2", + "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.26/alpha/linux64", - "version": "1.1.26" + "url": "https://factorio.com/get-download/1.1.27/alpha/linux64", + "version": "1.1.27" } }, "demo": { @@ -28,12 +28,12 @@ "version": "1.1.27" }, "stable": { - "name": "factorio_demo_x64-1.1.26.tar.xz", + "name": "factorio_demo_x64-1.1.27.tar.xz", "needsAuth": false, - "sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x", + "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.26/demo/linux64", - "version": "1.1.26" + "url": "https://factorio.com/get-download/1.1.27/demo/linux64", + "version": "1.1.27" } }, "headless": { @@ -46,12 +46,12 @@ "version": "1.1.27" }, "stable": { - "name": "factorio_headless_x64-1.1.26.tar.xz", + "name": "factorio_headless_x64-1.1.27.tar.xz", "needsAuth": false, - "sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj", + "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.26/headless/linux64", - "version": "1.1.26" + "url": "https://factorio.com/get-download/1.1.27/headless/linux64", + "version": "1.1.27" } } } diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 6692f9bd9b2..3600b2f1442 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -143,10 +143,10 @@ in buildFHSUserEnv rec { vulkan-loader expat wayland - xlibs.libxcb - xlibs.libXdamage - xlibs.libxshmfence - xlibs.libXxf86vm + xorg.libxcb + xorg.libXdamage + xorg.libxshmfence + xorg.libXxf86vm llvm_11.lib libelf ] ++ (if (!nativeOnly) then [ |