Add a bunch of riscv-related packages #213222

GenericNerdyUsername · 2023-01-28T20:33:44Z

Description of changes

Add riscv-gnu-toolchain, python3Packages.riscof, python3Packages.fusesoc and their dependencies

Things done

NickCao · 2023-01-29T00:17:52Z

May I ask why so many just want riscv-gnu-toolchain instead of using pkgsCross.riscv64.stdenv.cc, is there any specific feature that is not available in the nixpkgs toolchain?

GenericNerdyUsername · 2023-01-29T13:02:00Z

pkgsCross.riscv(64/32).stdenv.cc targets riscv(64/32)-unknown-linux-gnu, riscv-gnu-toolchain targets riscv(64/32)-unkown-elf

NickCao · 2023-01-29T13:08:37Z

What about pkgsCross.riscv64-embedded

GenericNerdyUsername · 2023-01-29T16:35:17Z

That targets riscv64-none-elf, which I tried to use instead for something, but it didnt work

NickCao

This is a huge PR. Can we split into smaller ones to ease reviewing and merging?

NickCao · 2023-01-30T00:05:33Z

pkgs/applications/virtualization/sail-riscv/default.nix

+  pname = "sail-riscv";
+  version = "0.5";
+
+  nativeBuildInputs = with ocamlPackages; [ sail ocamlbuild findlib ncurses ocaml zlib.dev z3 ];


No need to use zlib.dev here, zlib is enough, stdenv automatically selects the correct output. Also only compilers/tools should reside in nativeBuildInputs, libraries should be in buildInputs. You may set strictDeps = true; to make sure everything is correctly located.

NickCao · 2023-01-30T00:06:37Z

pkgs/applications/virtualization/sail-riscv/default.nix

+
+  outputs = [ "out" "ocaml_emu" "isabelle_model" "coq_model" "hol4_model" ];
+
+  preConfigure = "sed 's/^SAIL:=$(/SAIL:=sail #/' -i Makefile";


set makeFlags = [ "SAIL=sail" ] is normally enough, no need to patch the Makefile.

NickCao · 2023-01-30T00:07:01Z

pkgs/applications/virtualization/sail-riscv/default.nix

+  SAIL_DIR = "${ocamlPackages.sail}/share/sail";
+  SAIL = "sail";


Move these to makeFlags if possible.

NickCao · 2023-01-30T00:10:33Z

pkgs/applications/virtualization/sail-riscv/default.nix

+    runHook preInstall
+    mkdir -p $out/bin
+    cp c_emulator/riscv_sim_${arch} $out/bin
+    mkdir -p $ocaml_emu/bin
+    cp ocaml_emulator/riscv_ocaml_sim_${arch} $ocaml_emu/bin
+    cp -r generated_definitions/coq/ $coq_model
+    cp -r generated_definitions/isabelle/ $isabelle_model
+    cp -r generated_definitions/hol4/ $hol4_model
+    runHook postInstall


Are these files extremely large or something? Keeping everything in $out is fine in most cases.

Suggested change

runHook preInstall

mkdir -p $out/bin

cp c_emulator/riscv_sim_${arch} $out/bin

mkdir -p $ocaml_emu/bin

cp ocaml_emulator/riscv_ocaml_sim_${arch} $ocaml_emu/bin

cp -r generated_definitions/coq/ $coq_model

cp -r generated_definitions/isabelle/ $isabelle_model

cp -r generated_definitions/hol4/ $hol4_model

runHook postInstall

runHook preInstall

install -Dm755 c_emulator/riscv_sim_${arch} $out/bin/riscv_sim_${arch}

install -Dm755 ocaml_emulator/riscv_ocaml_sim_${arch} $ocaml_emu/bin/riscv_ocaml_sim_${arch}

cp -r generated_definitions/coq/ $coq_model

cp -r generated_definitions/isabelle/ $isabelle_model

cp -r generated_definitions/hol4/ $hol4_model

runHook postInstall

NickCao · 2023-01-30T01:02:03Z

pkgs/development/compilers/riscv-gnu-toolchain/default.nix

+  };
+  newlib = {
+    url = newlib.src.url;
+    hash = "sha256-8pbjcvUTJCJNOHzBFtw3pr05cZh1Z0b5OisC6aXUAVQ=";


(same for spike and pk) Why override the hash here?

The original (newlib/spike/pk).src uses fetchurl, not fetchzip, so its just more convenient

However the url could change as the versions are updated, these override would slowly rotten.

NickCao · 2023-01-30T01:05:41Z

pkgs/development/ocaml-modules/lem/default.nix

+    mv $out/bin/lem $out/bin/.lem_wrapped
+    makeWrapper $out/bin/.lem_wrapped $out/bin/lem --set LEMLIB $out/share/lem/library


Use wrapProgram in stead of makeWrapper, which automatically handles creating .foo-wrapped.

NickCao · 2023-01-30T01:06:52Z

pkgs/development/ocaml-modules/sail/default.nix

+  duneVersion = "3";
+  minimalOCamlVersion = "4.08";
+
+  SAIL_DIR = "$out";


Could this be moved to makeFlags (or equivalent for buildDunePackage, I know little about ocaml packaging.)

Which part in the project need this ? maybe their is a better way.

NickCao · 2023-01-30T01:07:37Z

pkgs/development/ocaml-modules/sail/default.nix

+  buildPhase = ''
+    runHook preBuild
+    rm -r aarch*  # Remove code derived from non-bsd2 arm spec
+    rm -r snapshots  # Some of this might be derived from stuff in the aarch dir, it builds fine without it
+    dune build --release ''${enableParallelBuild:+-j $NIX_BUILD_CORES}
+    runHook postBuild
+  '';
+  checkPhase = ''
+    runHook preCheck
+    dune runtest ''${enableParallelBuild:+-j $NIX_BUILD_CORES}
+    runHook postCheck
+  '';
+  installPhase = ''
+    runHook preInstall
+    dune install --prefix $out --libdir $OCAMLFIND_DESTDIR
+    runHook postInstall
+  '';


Looks like these should have been handled by buildDunePackage?

buildDunePackage only builds a single package from a source tree, sail has multiple packages in the same source tree

NickCao · 2023-01-30T01:07:51Z

pkgs/development/ocaml-modules/sail/default.nix

+  '';
+  postInstall = ''
+    mv $out/bin/sail $out/bin/.sail_wrapped
+    makeWrapper $out/bin/.sail_wrapped $out/bin/sail --set SAIL_DIR $out/share/sail


use wrapProgram

NickCao · 2023-01-30T01:08:42Z

pkgs/development/python-modules/fusesoc/default.nix

+  pname = "fusesoc";
+  version = "1.12.0";
+
+  propagatedBuildInputs = [ edalize pyparsing pyyaml simplesat ipyxact verilog verilator gnumake gcc ];


Why are gnumake and gcc in propagated build inputs?

it should be in propagatedNativeBuildInputs or nativeBuildInputs

theyre needed at runtime

Et7f3

please add why doCheck are disabled otherwise it looks correct (I haven't tested)

Et7f3 · 2023-01-30T03:42:25Z

pkgs/development/ocaml-modules/sail/default.nix

+    rm -r aarch*  # Remove code derived from non-bsd2 arm spec
+    rm -r snapshots  # Some of this might be derived from stuff in the aarch dir, it builds fine without it


Why not define it un preBuild hook ? since you rewrite a part of buildDunePackage

Et7f3 · 2023-01-30T03:43:14Z

pkgs/development/ocaml-modules/sail/default.nix

+  duneVersion = "3";
+  minimalOCamlVersion = "4.08";
+
+  SAIL_DIR = "$out";


Which part in the project need this ? maybe their is a better way.

Et7f3 · 2023-01-30T03:44:03Z

pkgs/development/python-modules/dataproperty/default.nix

+  version = "0.55.0";
+
+  propagatedBuildInputs = [ mbstrdecoder typepy ];
+  doCheck = false;


Why disabling test ?

Et7f3 · 2023-01-30T03:44:51Z

pkgs/development/python-modules/fusesoc/default.nix

+  pname = "fusesoc";
+  version = "1.12.0";
+
+  propagatedBuildInputs = [ edalize pyparsing pyyaml simplesat ipyxact verilog verilator gnumake gcc ];


it should be in propagatedNativeBuildInputs or nativeBuildInputs

Et7f3 · 2023-01-30T03:45:37Z

pkgs/development/python-modules/mbstrdecoder/default.nix

+  version = "1.1.1";
+
+  propagatedBuildInputs = [ chardet ];
+  doCheck = false;


Why those test are disabled

Et7f3 · 2023-01-30T03:47:58Z

pkgs/development/python-modules/simplesat/default.nix

+let
+
+  versionFile = writeText "simplesat_ver" ''
+    # THIS FILE IS GENERATED FROM SETUP_EXT


Can you add command if someone need to regenerate this ?

Et7f3 · 2023-01-30T03:48:38Z

pkgs/development/python-modules/tcolorpy/default.nix

+buildPythonPackage rec {
+  pname = "tcolorpy";
+  version = "0.1.2";
+  doCheck = false;


Et7f3 · 2023-01-30T03:48:48Z

pkgs/development/python-modules/typepy/default.nix

+  version = "1.3.0";
+
+  propagatedBuildInputs = [ mbstrdecoder python-dateutil pytz packaging ];
+  doCheck = false;


Et7f3 · 2023-01-30T03:49:03Z

pkgs/development/python-modules/zipfile2/default.nix

+  pname = "zipfile2";
+  version = "0.0.12";
+
+  doCheck = false;


Et7f3 · 2023-01-30T03:50:36Z

pkgs/top-level/all-packages.nix

@@ -32129,7 +32144,7 @@ with pkgs;

  eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };

-  qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {};
+  qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat { };


please avoid unrelated change it is bad for git diff (or do this in a separate commit so it can be in .git-blame-ignore-revs)

Et7f3 · 2023-01-30T04:07:16Z

ofborg doesn't understands sail-riscv-*: prefix could you list them all ? and repush this commit ?

GenericNerdyUsername · 2023-01-30T10:57:47Z

This is a huge PR. Can we split into smaller ones to ease reviewing and merging?

One for riscv-gnu-toolchain, one for python3Packages.riscof and one for python3Packages.fusesoc?

NickCao · 2023-01-30T10:59:33Z

One for riscv-gnu-toolchain, one for python3Packages.riscof and one for python3Packages.fusesoc?

Just do it as you would like to.

GenericNerdyUsername · 2023-01-30T20:06:49Z

ofborg doesn't understands sail-riscv-*: prefix could you list them all ? and repush this commit ?

where do I check this?

Et7f3 · 2023-01-30T22:40:52Z

ofborg doesn't understands sail-riscv-*: prefix could you list them all ? and repush this commit ?

where do I check this?

My bad it seem to have found sail-riscv-rv32 and sail-riscv-rv64 by another means. It didn't find riscv-gnu-toolchain-*

You can check what is found here

The general rule of thumb is spell them all separated via comma no brace/abbreviations and it will be fine. So for the first commit sail-riscv-rv32,sail-riscv-rv64: ... or more if more attribute were added

GenericNerdyUsername · 2023-02-06T21:33:27Z

All sub-PRs are done

GenericNerdyUsername added 19 commits January 26, 2023 19:36

Add GenericNerdyUsername to maintainer-list.nix

3790bb8

python3Packages.mbstrdecoder: init at 1.1.1

1eedee1

python3Packages.typepy: init at 1.3.0

353ba79

python3Packages.tcolorpy: init at 0.1.2

21b4685

python3Packages.dataproperty: init at 0.55.0

3f9b190

python3Packages.tabledata: init at 1.3.0

ab24ccf

python3Packages.pytablewriter: init at 0.64.2

6369162

python3Packages.riscv-isac: init at 0.16.1

4230e35

python3Packages.ipyxact: init at 0.3.2

27e9f60

python3Packages.zipfile2: init at 0.0.12

7d8b0f0

python3Packages.okonomiyaki: init at 1.3.2

76234cd

python3Packages.simplesat: init at 0.8.2

002982f

python3Packages.fusesoc: init at 1.12.0

bd0320a

python3Packages.riscv-config: init at 3.5.0

e2960e7

ocamlPackages.lem: init at 2022-12-10

525b19b

ocamlPackages.linksem: init at 0.8

e50a8b7

ocamlPackages.sail: init at 0.15

d20823e

sail-riscv-*: init at 0.5

5084ca9

python3Packages.riscof: init at 1.25.2

a69397e

GenericNerdyUsername requested review from FRidh and jonringer as code owners January 28, 2023 20:33

github-actions bot added 6.topic: ocaml 6.topic: python labels Jan 28, 2023

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Jan 28, 2023

alyssais requested a review from zhaofengli January 28, 2023 21:07

riscv-gnu-toolchain-*: init at 2023.01.04

935f374

GenericNerdyUsername force-pushed the more-riscv-pkgs branch from a1d52e7 to 935f374 Compare January 29, 2023 17:28

NickCao reviewed Jan 30, 2023

View reviewed changes

Et7f3 reviewed Jan 30, 2023

View reviewed changes

GenericNerdyUsername mentioned this pull request Jan 31, 2023

python3Packages.riscof: init 1.25.2 #213832

Merged

13 tasks

Et7f3 mentioned this pull request Feb 1, 2023

graphql-cohttp: ocaml-crunch -> crunch #170664

Draft

13 tasks

This was referenced Feb 2, 2023

riscv-gnu-toolchain-*: init at 2023.01.04 #214185

Closed

fusesoc: init at 1.12.0 #215001

Merged

GenericNerdyUsername closed this Feb 6, 2023

GenericNerdyUsername deleted the more-riscv-pkgs branch February 6, 2023 21:34


		outputs = [ "out" "ocaml_emu" "isabelle_model" "coq_model" "hol4_model" ];

		preConfigure = "sed 's/^SAIL:=$(/SAIL:=sail #/' -i Makefile";

		SAIL_DIR = "${ocamlPackages.sail}/share/sail";
		SAIL = "sail";

		mv $out/bin/lem $out/bin/.lem_wrapped
		makeWrapper $out/bin/.lem_wrapped $out/bin/lem --set LEMLIB $out/share/lem/library

		rm -r aarch* # Remove code derived from non-bsd2 arm spec
		rm -r snapshots # Some of this might be derived from stuff in the aarch dir, it builds fine without it

Add a bunch of riscv-related packages #213222

Add a bunch of riscv-related packages #213222

Conversation

GenericNerdyUsername commented Jan 28, 2023

Description of changes

Things done

NickCao commented Jan 29, 2023 • edited Loading

GenericNerdyUsername commented Jan 29, 2023

NickCao commented Jan 29, 2023

GenericNerdyUsername commented Jan 29, 2023 • edited Loading

NickCao left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Et7f3 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Et7f3 commented Jan 30, 2023

GenericNerdyUsername commented Jan 30, 2023

NickCao commented Jan 30, 2023

GenericNerdyUsername commented Jan 30, 2023

Et7f3 commented Jan 30, 2023

GenericNerdyUsername commented Feb 6, 2023

NickCao commented Jan 29, 2023 •

edited

Loading

GenericNerdyUsername commented Jan 29, 2023 •

edited

Loading