git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #109461 from thoughtpolice/nixpkgs/yosys-plugins

yosys: add support for loading plugins, revert symbiflow changes

commitd18e53761338ce6651039925f5632446ab69989b authorAustin Seipp <aseipp@pobox.com> dateSat 16 Jan 2021, 03:51 (6 years ago) parentbcdca929a951db
18 files changed+126−429
pkgs/data/misc/prjxray-db/default.nix−43 pkgs/data/misc/symbiflow-arch-defs/default.nix−47 pkgs/development/compilers/ghdl/default.nix+9−7 pkgs/development/compilers/prjxray-tools/default.nix−29 pkgs/development/compilers/symbiflow-vtr/default.nix−40 pkgs/development/compilers/symbiflow-yosys-plugins/default.nix−37 pkgs/development/compilers/symbiflow-yosys/default.nix−37 pkgs/development/compilers/yosys/default.nix+13−17 pkgs/development/compilers/yosys/plugin-search-dirs.patch+34 pkgs/development/compilers/yosys/plugins/bluespec.nix+32 pkgs/development/compilers/yosys/plugins/ghdl.nix+31 pkgs/development/compilers/yosys/setup-hook.sh+5 pkgs/development/python-modules/python-prjxray/default.nix−44 pkgs/development/python-modules/symbiflow-fasm/default.nix−27 pkgs/development/python-modules/textx/default.nix−36 pkgs/development/python-modules/xc-fasm/default.nix−45 pkgs/top-level/all-packages.nix+2−12 pkgs/top-level/python-packages.nix−8
pkgs/data/misc/prjxray-db/default.nixdeleted−43
@@ -1,43 +0,0 @@
1−{ lib, stdenv
2−, fetchFromGitHub
3−}:
4−
5−stdenv.mkDerivation rec {
6− pname = "prjxray-db";
7− version = "0.0-0232-g303a61d";
8−
9− src = fetchFromGitHub {
10− owner = "SymbiFlow";
11− repo = "prjxray-db";
12− rev = "303a61d8bc552f7a533b91b17448c59e908aa391";
13− sha256 = "0r75xig16dbgh3nfygggir0a160x52y766h7hd9xcib9m88jixb2";
14− };
15−
16− enableParallelBuilding = true;
17−
18− installPhase = ''
19− runHook preInstall
20−
21− DBDIR="$out/share/symbiflow/prjxray-db/"
22− DB_CONFIG="$out/bin/prjxray-config"
23−
24− mkdir -p $DBDIR $out/bin
25−
26− for device in artix7 kintex7 zynq7; do
27− cp -r $src/$device $DBDIR
28− done
29−
30− echo -e "#!/bin/sh\n\necho $DBDIR" > $DB_CONFIG
31− chmod +x $DB_CONFIG
32−
33− runHook postInstall
34− '';
35−
36− meta = with lib; {
37− description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation";
38− homepage = "https://github.com/SymbiFlow/prjxray-db";
39− license = licenses.cc0;
40− maintainers = with maintainers; [ mcaju ];
41− platforms = platforms.all;
42− };
43−}
pkgs/data/misc/symbiflow-arch-defs/default.nixdeleted−47
@@ -1,47 +0,0 @@
1−{ lib, stdenv
2−, fetchurl
3−, autoPatchelfHook
4−, python3Packages
5−, archs ? [ "xc7a100t" "xc7a50t" "xc7z010" "xc7z020" ]
6−}:
7−
8−stdenv.mkDerivation rec {
9− pname = "symbiflow-arch-defs";
10− version = "20200914-111752-g05d68df0";
11−
12− src = fetchurl {
13− url = "https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz";
14− sha256 = "1gmynybh8n33ag521w17c2kd16n834hqc6d8hi2pfs5kg1jl1a74";
15− };
16−
17− sourceRoot = ".";
18−
19− propagatedBuildInputs = [
20− python3Packages.lxml
21− python3Packages.python-constraint
22− ];
23−
24− installPhase = ''
25− mkdir -p $out/bin
26− cp -r bin/{symbiflow_*,vpr_common,python} $out/bin
27− for script in $out/bin/symbiflow_*; do
28− substituteInPlace $script --replace '/env' '/symbiflow_env'
29− done
30− cp bin/env $out/bin/symbiflow_env
31−
32− mkdir -p $out/share/symbiflow/arch
33− cp -r share/symbiflow/{scripts,techmaps} $out/share/symbiflow/
34−
35− for arch in ${builtins.concatStringsSep " " archs}; do
36− cp -r share/symbiflow/arch/"$arch"_test* $out/share/symbiflow/arch/
37− done
38− '';
39−
40− meta = with lib; {
41− description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation";
42− homepage = "https://github.com/SymbiFlow/symbiflow-arch-defs";
43− hydraPlatforms = [];
44− license = licenses.isc;
45− platforms = platforms.all;
46− };
47−}
pkgs/development/compilers/ghdl/default.nix+9−7
@@ -5,13 +5,15 @@ assert backend == "mcode" || backend == "llvm";
55
66stdenv.mkDerivation rec {
77 pname = "ghdl-${backend}";
8− version = "0.37";
8+ # NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable
9+ # version of the yosys plugin
10+ version = "unstable-2021.01.14";
911
1012 src = fetchFromGitHub {
11− owner = "ghdl";
12− repo = "ghdl";
13− rev = "v${version}";
14− sha256 = "0b53yl4im33c1cd4mdyc4ks9cmrpixym17gzchfmplrl22w3l17y";
13+ owner = "ghdl";
14+ repo = "ghdl";
15+ rev = "4868294436574660552ccef50a5b0849559393de";
16+ sha256 = "1wqjf0qc66dam1n2mskmlvj53bcsdwwk5rq9gimq6ah1vcwi222p";
1517 };
1618
1719 LIBRARY_PATH = "${stdenv.cc.libc}/lib";
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
2325 sed -i 's/check_version 7.0/check_version 7/g' configure
2426 '';
2527
26− configureFlags = lib.optional (backend == "llvm")
28+ configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm")
2729 "--with-llvm-config=${llvm}/bin/llvm-config";
2830
2931 hardeningDisable = [ "format" ];
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
3335 meta = with lib; {
3436 homepage = "https://github.com/ghdl/ghdl";
3537 description = "VHDL 2008/93/87 simulator";
36− maintainers = with maintainers; [ lucus16 ];
38+ maintainers = with maintainers; [ lucus16 thoughtpolice ];
3739 platforms = platforms.linux;
3840 license = licenses.gpl2;
3941 };
pkgs/development/compilers/prjxray-tools/default.nixdeleted−29
@@ -1,29 +0,0 @@
1−{ stdenv
2−, fetchFromGitHub
3−, cmake
4−}:
5−
6−stdenv.mkDerivation rec {
7− pname = "prjxray-tools";
8− version = "0.1-2676-gac8d30e3";
9−
10− src = fetchFromGitHub {
11− owner = "SymbiFlow";
12− repo = "prjxray";
13− fetchSubmodules = true;
14− rev = "ac8d30e3fe2029122408888d2313844b3e0c265b";
15− sha256 = "1ag7dk12hdhip821crwinncp8vgyzs0r85l1h2vbgn61lnxc7f4h";
16− };
17−
18− nativeBuildInputs = [ cmake ];
19−
20− doCheck = true;
21−
22− meta = with stdenv.lib; {
23− description = "Documenting the Xilinx 7-series bit-stream format";
24− homepage = "https://github.com/SymbiFlow/prjxray";
25− license = licenses.isc;
26− platforms = platforms.all;
27− maintainers = with maintainers; [ mcaju ];
28− };
29−}
pkgs/development/compilers/symbiflow-vtr/default.nixdeleted−40
@@ -1,40 +0,0 @@
1−{ stdenv
2−, fetchFromGitHub
3−, bison
4−, cmake
5−, flex
6−, pkg-config
7−}:
8−
9−stdenv.mkDerivation rec {
10− pname = "symbiflow-vtr";
11− version = "8.0.0.rc2-4003-g8980e4621";
12−
13− src = fetchFromGitHub {
14− owner = "SymbiFlow";
15− repo = "vtr-verilog-to-routing";
16− rev = "8980e46218542888fac879961b13aa7b0fba8432";
17− sha256 = "1sq7f1f3dzfm48a9vq5nvp0zllby0nasm3pvqab70f4jaq0m1aaa";
18− };
19−
20− nativeBuildInputs = [
21− bison
22− cmake
23− flex
24− pkg-config
25− ];
26−
27− cmakeFlags = [
28− "-DWITH_ODIN=OFF"
29− "-DWITH_ABC=OFF"
30− ];
31−
32− doCheck = true;
33−
34− meta = with stdenv.lib; {
35− description = "SymbiFlow WIP changes for Verilog to Routing (VTR)";
36− homepage = "https://github.com/SymbiFlow/vtr-verilog-to-routing";
37− platforms = platforms.all;
38− maintainers = with maintainers; [ mcaju ];
39− };
40−}
pkgs/development/compilers/symbiflow-yosys-plugins/default.nixdeleted−37
@@ -1,37 +0,0 @@
1−{ stdenv
2−, fetchFromGitHub
3−, symbiflow-yosys
4−, zlib
5−, readline
6−}:
7−
8−stdenv.mkDerivation rec {
9− pname = "symbiflow-yosys-plugins";
10− version = "1.0.0.7-0060-g7454cd6b";
11−
12− src = fetchFromGitHub {
13− owner = "SymbiFlow";
14− repo = "yosys-symbiflow-plugins";
15− rev = "7454cd6b5e4fd22854e2ada219a5e3c3a06e0717";
16− sha256 = "0r9r31p7fy4ylfrwvwlbivq5a03xrph34blxbxzx2c8bc02mbv0s";
17− };
18−
19− enableParallelBuilding = true;
20−
21− nativeBuildInputs = [ symbiflow-yosys ];
22−
23− buildInputs = [
24− readline
25− zlib
26− ];
27−
28− makeFlags = [ "PLUGINS_DIR=${placeholder "out"}/share/yosys/plugins" ];
29−
30− meta = with stdenv.lib; {
31− description = "Yosys SymbiFlow Plugins";
32− homepage = "https://github.com/SymbiFlow/yosys-symbiflow-plugins";
33− license = licenses.isc;
34− platforms = platforms.all;
35− maintainers = with maintainers; [ mcaju ];
36− };
37−}
pkgs/development/compilers/symbiflow-yosys/default.nixdeleted−37
@@ -1,37 +0,0 @@
1−{ stdenv
2−, abc-verifier
3−, fetchFromGitHub
4−, yosys
5−, plugins ? []
6−}:
7−
8−let
9− localAbc-verifier = abc-verifier.overrideAttrs (_: rec {
10− pname = "abc-verifier";
11− version = "2020.06.22";
12−
13− src = fetchFromGitHub {
14− owner = "YosysHQ";
15− repo = "abc";
16− rev = "341db25668f3054c87aa3372c794e180f629af5d";
17− sha256 = "14cgv34vz5ljkcms6nrv19vqws2hs8bgjgffk5q03cbxnm2jxv5s";
18− };
19−
20− passthru.rev = src.rev;
21− });
22−in
23−
24−(yosys.overrideAttrs (oldAttrs: rec {
25− pname = "symbiflow-yosys";
26− version = "0.9+2406";
27−
28− src = fetchFromGitHub {
29− owner = "SymbiFlow";
30− repo = "yosys";
31− rev = "d8b2d1a2b1a93057678cf49bb8f0329f191faba1";
32− sha256 = "1w8jnqzabvzixjllhb6ak2n2gmjvsn6qd996i7z70bsq5rgdkq9g";
33− };
34−})).override {
35− abc-verifier = localAbc-verifier;
36− plugins = plugins;
37−}
pkgs/development/compilers/yosys/default.nix+13−17
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ stdenv, lib
22, abc-verifier
33, bash
44, bison
@@ -12,7 +12,6 @@
1212, tcl
1313, verilog
1414, zlib
15−, plugins ? []
1615}:
1716
1817# NOTE: as of late 2020, yosys has switched to an automation robot that
@@ -33,8 +32,6 @@
3332# ultimately less confusing than using dates.
3433
3534stdenv.mkDerivation rec {
36− inherit plugins;
37−
3835 pname = "yosys";
3936 version = "0.9+3830";
4037
@@ -46,17 +43,21 @@ stdenv.mkDerivation rec {
4643 };
4744
4845 enableParallelBuilding = true;
49− nativeBuildInputs = [ pkg-config protobuf flex bison python3 ];
46+ nativeBuildInputs = [ pkg-config bison flex ];
5047 buildInputs = [ tcl readline libffi python3 protobuf zlib ];
5148
5249 makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];
5350
54− patchPhase = ''
51+ patches = [
52+ ./plugin-search-dirs.patch
53+ ];
54+
55+ postPatch = ''
5556 substituteInPlace ./Makefile \
5657 --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
58+
5759 chmod +x ./misc/yosys-config.in
58− patchShebangs ./misc/yosys-config.in
59− patchShebangs tests
60+ patchShebangs tests ./misc/yosys-config.in
6061 '';
6162
6263 preBuild = let
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
7576 fi
7677
7778 if ! grep -q "YOSYS_VER := $version" Makefile; then
78− echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package ($version), failing."
79+ echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
7980 exit 1
8081 fi
8182 '';
@@ -92,16 +93,11 @@ stdenv.mkDerivation rec {
9293 # add a symlink to fake things so that both variants work the same way. this
9394 # is also needed at build time for the test suite.
9495 postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc";
95− postInstall = ''
96− ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc
96+ postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc";
9797
98− mkdir -p $out/share/yosys/plugins
99− for plugin in $plugins; do
100− ln -sfv $plugin/share/yosys/plugins/* $out/share/yosys/plugins/
101− done
102− '';
98+ setupHook = ./setup-hook.sh;
10399
104− meta = with stdenv.lib; {
100+ meta = with lib; {
105101 description = "Open RTL synthesis framework and tools";
106102 homepage = "http://www.clifford.at/yosys/";
107103 license = licenses.isc;
pkgs/development/compilers/yosys/plugin-search-dirs.patchnew file+34
@@ -0,0 +1,34 @@
1+diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
2+index 3ed19497..f9534bd0 100644
3+--- a/passes/cmds/plugin.cc
4++++ b/passes/cmds/plugin.cc
5+@@ -75,8 +75,27 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
6+ #endif
7+
8+ void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL);
9+- if (hdl == NULL && orig_filename.find('/') == std::string::npos)
10+- hdl = dlopen((proc_share_dirname() + "plugins/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL);
11++ if (hdl == NULL && orig_filename.find('/') == std::string::npos) {
12++ std::string install_dir = proc_share_dirname() + "plugins";
13++
14++ vector<string> all_dirs;
15++ all_dirs.push_back(install_dir);
16++
17++ char* plugin_dirs = getenv("NIX_YOSYS_PLUGIN_DIRS");
18++ if (plugin_dirs != NULL) {
19++ std::string p(plugin_dirs), t;
20++ std::stringstream ss(p);
21++
22++ while(std::getline(ss, t, ':')) {
23++ all_dirs.push_back(t);
24++ }
25++ }
26++
27++ for (auto dir : all_dirs) {
28++ hdl = dlopen((dir + "/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL);
29++ if (hdl != NULL) break;
30++ }
31++ }
32+ if (hdl == NULL)
33+ log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror());
34+ loaded_plugins[orig_filename] = hdl;
pkgs/development/compilers/yosys/plugins/bluespec.nixnew file+32
@@ -0,0 +1,32 @@
1+{ stdenv, lib, fetchFromGitHub, pkg-config
2+, yosys, readline, zlib, bluespec
3+}:
4+
5+stdenv.mkDerivation {
6+ pname = "yosys-bluespec";
7+ version = "2021.01.14";
8+
9+ src = fetchFromGitHub {
10+ owner = "thoughtpolice";
11+ repo = "yosys-bluespec";
12+ rev = "7a0c609e9b601560067c34b8ce41e89ea4a397d4";
13+ sha256 = "0xj9j5dwvq0dwqzfjd4ikmxkd28amj6d9m6ava7pwcrpjhyjnd0c";
14+ };
15+
16+ buildInputs = [ yosys readline zlib bluespec ];
17+ nativeBuildInputs = [ pkg-config ];
18+
19+ doCheck = true;
20+ makeFlags = [
21+ "PREFIX=$(out)/share/yosys/plugins"
22+ "STATIC_BSC_PATH=${bluespec}/bin/bsc"
23+ "STATIC_BSC_LIBDIR=${bluespec}/lib"
24+ ];
25+
26+ meta = with lib; {
27+ description = "Bluespec plugin for Yosys";
28+ license = licenses.isc;
29+ platforms = platforms.all;
30+ maintainers = with maintainers; [ thoughtpolice ];
31+ };
32+}
pkgs/development/compilers/yosys/plugins/ghdl.nixnew file+31
@@ -0,0 +1,31 @@
1+{ stdenv, lib, fetchFromGitHub, pkg-config
2+, yosys, readline, zlib, ghdl
3+}:
4+
5+stdenv.mkDerivation {
6+ pname = "yosys-ghdl";
7+ version = "2021.01.01";
8+
9+ src = fetchFromGitHub {
10+ owner = "ghdl";
11+ repo = "ghdl-yosys-plugin";
12+ rev = "8b3e740fef9a653a20a838f1ade475960e1d379b";
13+ sha256 = "13kpcp37r11xgqd8aksddi40a5vpzqi7p8qgyjbs99lyscyli75x";
14+ };
15+
16+ buildInputs = [ yosys readline zlib ghdl ];
17+ nativeBuildInputs = [ pkg-config ];
18+
19+ doCheck = true;
20+ installPhase = ''
21+ mkdir -p $out/share/yosys/plugins
22+ cp ghdl.so $out/share/yosys/plugins/ghdl.so
23+ '';
24+
25+ meta = with lib; {
26+ description = "GHDL plugin for Yosys";
27+ license = licenses.isc;
28+ platforms = platforms.all;
29+ maintainers = with maintainers; [ thoughtpolice ];
30+ };
31+}
pkgs/development/compilers/yosys/setup-hook.shnew file+5
@@ -0,0 +1,5 @@
1+addYosysPluginPath() {
2+ addToSearchPath NIX_YOSYS_PLUGIN_DIRS "$1/share/yosys/plugins"
3+}
4+
5+addEnvHooks "$targetOffset" addYosysPluginPath
pkgs/development/python-modules/python-prjxray/default.nixdeleted−44
@@ -1,44 +0,0 @@
1−{ stdenv
2−, fetchFromGitHub
3−, pkgs
4−, buildPythonPackage
5−, intervaltree
6−, numpy
7−, openpyxl
8−, parse
9−, progressbar
10−, pyjson5
11−, pyyaml
12−, simplejson
13−, symbiflow-fasm
14−, textx
15−}:
16−
17−buildPythonPackage rec {
18− pname = "python-prjxray";
19− version = pkgs.prjxray-tools.version;
20−
21− src = pkgs.prjxray-tools.src;
22−
23− propagatedBuildInputs = [
24− intervaltree
25− numpy
26− openpyxl
27− parse
28− progressbar
29− pyjson5
30− pyyaml
31− simplejson
32− symbiflow-fasm
33− textx
34− ];
35−
36− doCheck = false;
37−
38− meta = with stdenv.lib; {
39− description = "Documenting the Xilinx 7-series bit-stream format";
40− homepage = "https://github.com/SymbiFlow/prjxray";
41− license = licenses.isc;
42− maintainers = with maintainers; [ mcaju ];
43− };
44−}
pkgs/development/python-modules/symbiflow-fasm/default.nixdeleted−27
@@ -1,27 +0,0 @@
1−{ stdenv
2−, pkgs
3−, fetchFromGitHub
4−, buildPythonPackage
5−, textx
6−}:
7−
8−buildPythonPackage rec {
9− pname = "symbiflow-fasm";
10− version = "0.0.1-g4857dde";
11−
12− src = fetchFromGitHub {
13− owner = "SymbiFlow";
14− repo = "fasm";
15− rev = "4857dde757edd88688c2faf808774d85bdbe3900";
16− sha256 = "1za7f8slf8wvp1mfbfc3vdv61115p49k0vwngs4db6ips1qg1435";
17− };
18−
19− propagatedBuildInputs = [ textx ];
20−
21− meta = with stdenv.lib; {
22− description = "FPGA Assembly (FASM) Parser and Generation library";
23− homepage = "https://github.com/SymbiFlow/fasm";
24− license = licenses.isc;
25− maintainers = with maintainers; [ mcaju ];
26− };
27−}
pkgs/development/python-modules/textx/default.nixdeleted−36
@@ -1,36 +0,0 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchPypi
4−, pytestCheckHook
5−, arpeggio
6−, click
7−, jinja2
8−}:
9−
10−buildPythonPackage rec {
11− pname = "textX";
12− version = "2.2.0";
13−
14− src = fetchPypi {
15− inherit pname;
16− inherit version;
17− sha256 = "00mwd588ms96qp27m5vpjkzk30wfw53hnmv8y77slxca8lw9vq82";
18− };
19−
20− checkInputs = [ pytestCheckHook ];
21−
22− pytestFlagsArray = [ "tests/functional" ];
23−
24− propagatedBuildInputs = [
25− arpeggio
26− click
27− jinja2
28− ];
29−
30− meta = with stdenv.lib; {
31− description = "textX is a meta-language for building Domain-Specific Languages (DSLs) in Python";
32− homepage = "https://textx.github.io";
33− license = licenses.mit;
34− maintainers = with maintainers; [ mcaju ];
35− };
36−}
pkgs/development/python-modules/xc-fasm/default.nixdeleted−45
@@ -1,45 +0,0 @@
1−{ stdenv
2−, fetchFromGitHub
3−, buildPythonPackage
4−, pytestCheckHook
5−, simplejson
6−, intervaltree
7−, python-prjxray
8−, symbiflow-fasm
9−, textx
10−}:
11−
12−buildPythonPackage rec {
13− pname = "xc-fasm";
14− version = "0.0.1-g0ddd9516";
15−
16− src = fetchFromGitHub {
17− owner = "SymbiFlow";
18− repo = "xc-fasm";
19− rev = "0ddd951602d47d5b95f2072f8aa751af5e81e577";
20− sha256 = "15bzw92sx99s0zldr48na4yhrnp7b90nxsd8ya6ag1pvvijp2al4";
21− };
22−
23− propagatedBuildInputs = [
24− simplejson
25− intervaltree
26− python-prjxray
27− symbiflow-fasm
28− textx
29− ];
30−
31− # Pip will check for and then install missing dependecies.
32− # Because some of them are installed from git, it will try
33− # to download them even if they're present in
34− # propagatedBuildInputs.
35− pipInstallFlags = [ "--no-deps" ];
36−
37− checkInputs = [ pytestCheckHook ];
38−
39− meta = with stdenv.lib; {
40− description = "XC FASM libraries";
41− homepage = "https://github.com/SymbiFlow/xc-fasm";
42− license = licenses.isc;
43− maintainers = with maintainers; [ mcaju ];
44− };
45−}
pkgs/top-level/all-packages.nix+2−12
@@ -10722,12 +10722,6 @@ in
1072210722
1072310723 swift = callPackage ../development/compilers/swift { };
1072410724
10725− symbiflow-vtr = callPackage ../development/compilers/symbiflow-vtr { };
10726−
10727− symbiflow-yosys = callPackage ../development/compilers/symbiflow-yosys { };
10728−
10729− symbiflow-yosys-plugins = callPackage ../development/compilers/symbiflow-yosys-plugins { };
10730−
1073110725 swiProlog = callPackage ../development/compilers/swi-prolog {
1073210726 inherit (darwin.apple_sdk.frameworks) Security;
1073310727 jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -10840,6 +10834,8 @@ in
1084010834 yasm = callPackage ../development/compilers/yasm { };
1084110835
1084210836 yosys = callPackage ../development/compilers/yosys { };
10837+ yosys-bluespec = callPackage ../development/compilers/yosys/plugins/bluespec.nix { };
10838+ yosys-ghdl = callPackage ../development/compilers/yosys/plugins/ghdl.nix { };
1084310839
1084410840 z88dk = callPackage ../development/compilers/z88dk { };
1084510841
@@ -11098,8 +11094,6 @@ in
1109811094 polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
1109911095 polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };
1110011096
11101− prjxray-tools = callPackage ../development/compilers/prjxray-tools { };
11102−
1110311097 pure = callPackage ../development/interpreters/pure {
1110411098 /*llvm = llvm_35;*/
1110511099 };
@@ -20634,8 +20628,6 @@ in
2063420628 inherit (darwin.apple_sdk.frameworks) Security;
2063520629 };
2063620630
20637− prjxray-db = callPackage ../data/misc/prjxray-db { };
20638−
2063920631 profont = callPackage ../data/fonts/profont
2064020632 { inherit (buildPackages.xorg) mkfontscale; };
2064120633
@@ -20671,8 +20663,6 @@ in
2067120663
2067220664 sweet = callPackage ../data/themes/sweet { };
2067320665
20674− symbiflow-arch-defs = callPackage ../data/misc/symbiflow-arch-defs { };
20675−
2067620666 mime-types = callPackage ../data/misc/mime-types { };
2067720667
2067820668 shared-mime-info = callPackage ../data/misc/shared-mime-info { };
pkgs/top-level/python-packages.nix−8
@@ -4812,8 +4812,6 @@ in {
48124812
48134813 python-openems = callPackage ../development/python-modules/python-openems { };
48144814
4815− python-prjxray = callPackage ../development/python-modules/python-prjxray { };
4816−
48174815 python-tado = callPackage ../development/python-modules/python-tado { };
48184816
48194817 pkutils = callPackage ../development/python-modules/pkutils { };
@@ -7407,8 +7405,6 @@ in {
74077405
74087406 sybil = callPackage ../development/python-modules/sybil { };
74097407
7410− symbiflow-fasm = callPackage ../development/python-modules/symbiflow-fasm { };
7411−
74127408 symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; };
74137409
74147410 sympy = if isPy3k then
@@ -7526,8 +7522,6 @@ in {
75267522
75277523 textfsm = callPackage ../development/python-modules/textfsm { };
75287524
7529− textx = callPackage ../development/python-modules/textx { };
7530−
75317525 testpath = callPackage ../development/python-modules/testpath { };
75327526
75337527 testrepository = callPackage ../development/python-modules/testrepository { };
@@ -8179,8 +8173,6 @@ in {
81798173
81808174 xattr = callPackage ../development/python-modules/xattr { };
81818175
8182− xc-fasm = callPackage ../development/python-modules/xc-fasm { };
8183−
81848176 xcaplib = callPackage ../development/python-modules/xcaplib { };
81858177
81868178 xcffib = callPackage ../development/python-modules/xcffib { };