···22, pkgconfig, libftdi1
33, python3, pypy3
4455-# PyPy yields large improvements in build time and runtime performance,
66-# and IceStorm isn't intended to be used as a library other than by the
77-# nextpnr build process (which is also sped up by using PyPy), so we
88-# use it by default. See 18839e1 for more details.
55+# PyPy yields large improvements in build time and runtime performance, and
66+# IceStorm isn't intended to be used as a library other than by the nextpnr
77+# build process (which is also sped up by using PyPy), so we use it by default.
88+# See 18839e1 for more details.
99+#
1010+# FIXME(aseipp, 3/1/2021): pypy seems a bit busted since stdenv upgrade to gcc
1111+# 10/binutils 2.34, so short-circuit this for now in passthru below (done so
1212+# that downstream overrides can't re-enable pypy and break their build somehow)
913, usePyPy ? stdenv.hostPlatform.system == "x86_64-linux"
1014}:
11151216stdenv.mkDerivation rec {
1317 pname = "icestorm";
1414- version = "2020.08.19";
1818+ version = "2020.12.04";
15191620 passthru = rec {
1717- pythonPkg = if usePyPy then pypy3 else python3;
2121+ pythonPkg = if (false && usePyPy) then pypy3 else python3;
1822 pythonInterp = pythonPkg.interpreter;
1923 };
20242125 src = fetchFromGitHub {
2226 owner = "YosysHQ";
2327 repo = "icestorm";
2424- rev = "da52117ccd5b4147f64dc7345357ec5439cd7543";
2525- sha256 = "072bl3vmvb06ry0ci3b1sfjpm3iigb874khzja4azcai969ybp4k";
2828+ rev = "7afc64b480212c9ac2ce7cb1622731a69a7d212c";
2929+ sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk";
2630 };
27312832 nativeBuildInputs = [ pkgconfig ];
···2222 # Note: when raising the version, ensure that all SNAPSHOT versions in
2323 # build.gradle are replaced by a fixed version
2424 # (the current one at the time of release) (see postPatch).
2525- version = "122";
2525+ version = "122.1";
2626 buildVersion = makeBuildVersion version;
27272828 src = fetchFromGitHub {
2929 owner = "Anuken";
3030 repo = "Mindustry";
3131 rev = "v${version}";
3232- sha256 = "19dxqscnny0c5w3pyg88hflrkhsqgd7zx19240kh4h69y3wwaz0m";
3232+ sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y";
3333 };
34343535 desktopItem = makeDesktopItem {
···8181 '';
8282 outputHashAlgo = "sha256";
8383 outputHashMode = "recursive";
8484- outputHash = "1kymfrd2vd23y1rmx19q47wc212r6qx03x6g58pxbqyylxmcw5zq";
8484+ outputHash = "0vzck6hsrvs438s3ikk66qmpak88bmqcb8inqbbjwy7x87d2qsvj";
8585 };
86868787 # Separate commands for building and installing the server and the client