···2, pkgconfig, libftdi1
3, python3, pypy3
45-# PyPy yields large improvements in build time and runtime performance,
6-# and IceStorm isn't intended to be used as a library other than by the
7-# nextpnr build process (which is also sped up by using PyPy), so we
8-# use it by default. See 18839e1 for more details.
00009, usePyPy ? stdenv.hostPlatform.system == "x86_64-linux"
10}:
1112stdenv.mkDerivation rec {
13 pname = "icestorm";
14- version = "2020.08.19";
1516 passthru = rec {
17- pythonPkg = if usePyPy then pypy3 else python3;
18 pythonInterp = pythonPkg.interpreter;
19 };
2021 src = fetchFromGitHub {
22 owner = "YosysHQ";
23 repo = "icestorm";
24- rev = "da52117ccd5b4147f64dc7345357ec5439cd7543";
25- sha256 = "072bl3vmvb06ry0ci3b1sfjpm3iigb874khzja4azcai969ybp4k";
26 };
2728 nativeBuildInputs = [ pkgconfig ];
···2, pkgconfig, libftdi1
3, python3, pypy3
45+# PyPy yields large improvements in build time and runtime performance, and
6+# IceStorm isn't intended to be used as a library other than by the nextpnr
7+# build process (which is also sped up by using PyPy), so we use it by default.
8+# See 18839e1 for more details.
9+#
10+# FIXME(aseipp, 3/1/2021): pypy seems a bit busted since stdenv upgrade to gcc
11+# 10/binutils 2.34, so short-circuit this for now in passthru below (done so
12+# that downstream overrides can't re-enable pypy and break their build somehow)
13, usePyPy ? stdenv.hostPlatform.system == "x86_64-linux"
14}:
1516stdenv.mkDerivation rec {
17 pname = "icestorm";
18+ version = "2020.12.04";
1920 passthru = rec {
21+ pythonPkg = if (false && usePyPy) then pypy3 else python3;
22 pythonInterp = pythonPkg.interpreter;
23 };
2425 src = fetchFromGitHub {
26 owner = "YosysHQ";
27 repo = "icestorm";
28+ rev = "7afc64b480212c9ac2ce7cb1622731a69a7d212c";
29+ sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk";
30 };
3132 nativeBuildInputs = [ pkgconfig ];
···22 # Note: when raising the version, ensure that all SNAPSHOT versions in
23 # build.gradle are replaced by a fixed version
24 # (the current one at the time of release) (see postPatch).
25- version = "122";
26 buildVersion = makeBuildVersion version;
2728 src = fetchFromGitHub {
29 owner = "Anuken";
30 repo = "Mindustry";
31 rev = "v${version}";
32- sha256 = "19dxqscnny0c5w3pyg88hflrkhsqgd7zx19240kh4h69y3wwaz0m";
33 };
3435 desktopItem = makeDesktopItem {
···81 '';
82 outputHashAlgo = "sha256";
83 outputHashMode = "recursive";
84- outputHash = "1kymfrd2vd23y1rmx19q47wc212r6qx03x6g58pxbqyylxmcw5zq";
85 };
8687 # Separate commands for building and installing the server and the client
···22 # Note: when raising the version, ensure that all SNAPSHOT versions in
23 # build.gradle are replaced by a fixed version
24 # (the current one at the time of release) (see postPatch).
25+ version = "122.1";
26 buildVersion = makeBuildVersion version;
2728 src = fetchFromGitHub {
29 owner = "Anuken";
30 repo = "Mindustry";
31 rev = "v${version}";
32+ sha256 = "18m4s81cfb2cr2fj61nf6spiln7cbvx25g42w6fypfikflv3qd8y";
33 };
3435 desktopItem = makeDesktopItem {
···81 '';
82 outputHashAlgo = "sha256";
83 outputHashMode = "recursive";
84+ outputHash = "0vzck6hsrvs438s3ikk66qmpak88bmqcb8inqbbjwy7x87d2qsvj";
85 };
8687 # Separate commands for building and installing the server and the client
···48in
4950stdenv.mkDerivation rec {
51- # TODO: When bumping this version, please validate whether the wget patch is present upstream
52- # and remove the patch if it is. The patch should be present upstream for all versions 1.32.0+.
53- # See NixOs/nixpkgs#94722 for context.
54- name = "busybox-1.31.1";
5556 # Note to whoever is updating busybox: please verify that:
57 # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
58 # still builds after the update.
59 src = fetchurl {
60 url = "https://busybox.net/downloads/${name}.tar.bz2";
61- sha256 = "1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh";
62 };
6364 hardeningDisable = [ "format" "pie" ]
···6667 patches = [
68 ./busybox-in-store.patch
69- ./0001-Fix-build-with-glibc-2.31.patch
70- ./0001-wget-implement-TLS-verification-with-ENABLE_FEATURE_.patch
71 ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
7273 postPatch = "patchShebangs .";
···48in
4950stdenv.mkDerivation rec {
51+ name = "busybox-1.32.0";
0005253 # Note to whoever is updating busybox: please verify that:
54 # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
55 # still builds after the update.
56 src = fetchurl {
57 url = "https://busybox.net/downloads/${name}.tar.bz2";
58+ sha256 = "w12H8dBLKxU9M8J1wmMuQNOIqI8ZqecXJ+C7v/Uf5ok=";
59 };
6061 hardeningDisable = [ "format" "pie" ]
···6364 patches = [
65 ./busybox-in-store.patch
0066 ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
6768 postPatch = "patchShebangs .";