diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:51:01 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:51:01 +0100 |
commit | 71f4ba29a3161cec4dc95d6c80863f55ff25f777 (patch) | |
tree | 67774520442ab886120a8fd3b00dc52ea2455e8e /pkgs/applications/science | |
parent | 821c0844d499658666901401f2ae088b85cc2e9a (diff) | |
parent | e2b96562056ed59bd84c797f31c8decf60d2f5d3 (diff) | |
download | nixpkgs-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar nixpkgs-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.gz nixpkgs-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.bz2 nixpkgs-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.lz nixpkgs-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.xz nixpkgs-71f4ba29a3161cec4dc95d6c80863f55ff25f777.tar.zst nixpkgs-71f4ba29a3161cec4dc95d6c80863f55ff25f777.zip |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
Diffstat (limited to 'pkgs/applications/science')
3 files changed, 28 insertions, 12 deletions
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index ced075ff432..c0536b36cfe 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -33,8 +33,9 @@ in stdenv.mkDerivation rec { cp -r . "$out" rm -r $out/Libs - cp -r "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ - "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* "$out"/Maps/ + cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ + "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \ + "${maps.ladder2018season3}"/* "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/ ''; preFixup = '' diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 228bafe3f7c..c71099ad6a7 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -1,7 +1,7 @@ -{ fetchzip +{ fetchzip, unzip }: let - fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-P iagreetotheeula"; }); + fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-j -P iagreetotheeula"; }); in { minigames = fetchzip { @@ -17,32 +17,47 @@ in }; ladder2017season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip"; - sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh"; + sha256 = "0ngg4g74s2ryhylny93fm8yq9rlrhphwnjg2s6f3qr85a2b3zdpd"; stripRoot = false; }; ladder2017season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip"; - sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39"; + sha256 = "01kycnvqagql9pkjkcgngfcnry2pc4kcygdkk511m0qr34909za5"; stripRoot = false; }; ladder2017season3 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip"; - sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a"; + sha256 = "0wix3lwmbyxfgh8ldg0n66i21p0dbavk2dxjngz79rx708m8qvld"; stripRoot = false; }; ladder2017season4 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip"; - sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g"; + sha256 = "1sidnmk2rc9j5fd3a4623pvaika1mm1rwhznb2qklsqsq1x2qckp"; stripRoot = false; }; ladder2018season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip"; - sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f"; + sha256 = "0mp0ilcq0gmd7ahahc5i8c7bdr3ivk6skx0b2cgb1z89l5d76irq"; stripRoot = false; }; ladder2018season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip"; - sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx"; + sha256 = "176rs848cx5src7qbr6dnn81bv1i86i381fidk3v81q9bxlmc2rv"; + stripRoot = false; + }; + ladder2018season3 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season3.zip"; + sha256 = "1r3wv4w53g9zq6073ajgv74prbdsd1x3zfpyhv1kpxbffyr0x0zp"; + stripRoot = false; + }; + ladder2018season4 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season4.zip"; + sha256 = "0k47rr6pzxbanlqnhliwywkvf0w04c8hxmbanksbz6aj5wpkcn1s"; + stripRoot = false; + }; + ladder2019season1 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2019Season1.zip"; + sha256 = "1dlk9zza8h70lbjvg2ykc5wr9vsvvdk02szwrkgdw26mkssl2rg9"; stripRoot = false; }; } diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 694c621db00..76e5071908f 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.1.3"; in +let version = "4.1.5"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0padylvicyhcm4vqkizpknjfw8qxh39scw3mj5xbs9bs8c442kmx"; + sha256 = "654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46"; }; buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined |