diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2020-08-04 09:15:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 09:15:29 +0200 |
| commit | 85a6aa1131050c182bc258c7ae86b96597df263f (patch) | |
| tree | db479d5d903555c166853409f689335cd18ff78e /pkgs | |
| parent | 92769af4513be4737921893c68573c334d69df00 (diff) | |
| parent | 7652a8e3d5712342564fbcb095f66c49b6ebf4ea (diff) | |
| download | nixpkgs-85a6aa1131050c182bc258c7ae86b96597df263f.tar nixpkgs-85a6aa1131050c182bc258c7ae86b96597df263f.tar.gz nixpkgs-85a6aa1131050c182bc258c7ae86b96597df263f.tar.bz2 nixpkgs-85a6aa1131050c182bc258c7ae86b96597df263f.tar.lz nixpkgs-85a6aa1131050c182bc258c7ae86b96597df263f.tar.xz nixpkgs-85a6aa1131050c182bc258c7ae86b96597df263f.tar.zst nixpkgs-85a6aa1131050c182bc258c7ae86b96597df263f.zip | |
Merge pull request #94612 from OmnipotentEntity/master
katago: 1.4.4 -> 1.5.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/katago/default.nix | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index fd4303eb2b1..492ccbb63ab 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -17,7 +17,7 @@ , useTcmalloc ? true}: assert cudaSupport -> ( - libGL_driver != null && + libGL_driver != null && cudatoolkit != null && cudnn != null); @@ -29,36 +29,21 @@ assert useTcmalloc -> ( gperftools != null); let - env = if cudaSupport + env = if cudaSupport then gcc8Stdenv else stdenv; in env.mkDerivation rec { pname = "katago"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; - rev = "v${version}"; - sha256 = "14xs2bm8sky9cdsjdahjqs82q6blzcw05f5d9r1h171dm1hcx566"; + rev = "${version}"; + sha256 = "0ajdjdmlzwh7zwk5v0k9zzjawgkf7w30pzqp5bhcsdqz4svvyll2"; }; - # To workaround CMake 3.17.0's new buggy behavior wrt CUDA Compiler testing - # See the following tracking issues: - # KataGo: - # - Issue #225: https://github.com/lightvector/KataGo/issues/225 - # - PR #227: https://github.com/lightvector/KataGo/pull/227 - # CMake: - # - Issue #20708: https://gitlab.kitware.com/cmake/cmake/-/issues/20708 - patches = [ - (fetchpatch { - name = "227.patch"; - url = "https://patch-diff.githubusercontent.com/raw/lightvector/KataGo/pull/227.patch"; - sha256 = "03f1vmdjhb79mpj95sijcwla8acy32clrjgrn4xqw5h90zdgj511"; - }) - ]; - nativeBuildInputs = [ cmake makeWrapper |