diff --git a/flake.nix b/flake.nix index fb53ea6..2f5d7ec 100644 --- a/flake.nix +++ b/flake.nix @@ -70,13 +70,11 @@ attic-client = final.attic.override { clientOnly = true; }; bladeenc = final.callPackage ./packages/bladeenc { }; cups-dymo-patched = final.callPackage ./packages/cups-dymo { }; - cynthion = final.callPackage ./packages/cynthion { }; exhale = final.callPackage ./packages/exhale { }; gbeplus = final.callPackage ./packages/gbeplus { }; hactoolnet = final.callPackage ./packages/hactoolnet { }; ipsw = final.callPackage ./packages/ipsw { }; jlink = final.callPackage ./packages/jlink { }; - packetry = final.callPackage ./packages/packetry { }; stlink-tool = final.callPackage ./packages/stlink-tool { }; xwin = final.callPackage ./packages/xwin { }; zephyrPackages = final.callPackage ./packages/zephyr { }; diff --git a/packages/cynthion/default.nix b/packages/cynthion/default.nix deleted file mode 100644 index 0fbe7cb..0000000 --- a/packages/cynthion/default.nix +++ /dev/null @@ -1,258 +0,0 @@ -{ - fetchFromGitHub, - python3, - zsh, - stdenv, - yosys, - nextpnr, - trellis, -}: - -let - pyfwup = python3.pkgs.buildPythonPackage rec { - pname = "pyfwup"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "greatscottgadgets"; - repo = pname; - rev = version; - hash = "sha256-HZaR7X19kWb8w/VcnRHReGPkUBQ/u89BjmkTPpayoxE="; - }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; - - pyproject = true; - - nativeBuildInputs = with python3.pkgs; [ setuptools ]; - - propagatedBuildInputs = with python3.pkgs; [ - pyusb - tqdm - ]; - }; - - pygreat = python3.pkgs.buildPythonPackage rec { - pname = "pygreat"; - version = "2024.0.2"; - - src = fetchFromGitHub { - owner = "greatscottgadgets"; - repo = "libgreat"; - rev = "v${version}"; - hash = "sha256-yYp+2y4QIOykkrObWaXbZMMc2fsRn/+tGWqySA7V534="; - }; - - sourceRoot = "${src.name}/host"; - - postPatch = '' - substituteInPlace pyproject.toml --replace '"backports.functools_lru_cache",' "" - substituteInPlace pygreat/comms.py --replace "from backports.functools_lru_cache import lru_cache as memoize_with_lru_cache" "from functools import lru_cache as memoize_with_lru_cache" - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; - - pyproject = true; - nativeBuildInputs = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ - pyusb - future - ]; - }; - - amaranth = python3.pkgs.amaranth.overrideAttrs (attrs: rec { - version = "0.4.1"; - src = fetchFromGitHub { - owner = "amaranth-lang"; - repo = "amaranth"; - rev = "refs/tags/v${version}"; - hash = "sha256-VMgycvxkphdpWIib7aZwh588En145RgYlG2Zfi6nnDo="; - }; - }); - - apollo-fpga = python3.pkgs.buildPythonPackage rec { - pname = "apollo"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "greatscottgadgets"; - repo = pname; - rev = "v${version}"; - hash = "sha256-9BoHGdqjnWkP83zXdjzyoAhYB6n7SJ/zlr8pvqb+9kg="; - }; - - pyproject = true; - nativeBuildInputs = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ - deprecation - importlib-resources - pyusb - pyvcd - prompt-toolkit - pyxdg - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; - }; - usb-protocol = python3.pkgs.buildPythonPackage rec { - pname = "usb-protocol"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "greatscottgadgets"; - repo = "python-usb-protocol"; - rev = version; - hash = "sha256-CYbXs/SRC1FAVEzfw0gwf6U0qQ9Q34nyuj5yfjHfDn8="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; - - pyproject = true; - nativeBuildInputs = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ construct ]; - }; - luna-usb = python3.pkgs.buildPythonPackage rec { - pname = "luna-usb"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "greatscottgadgets"; - repo = "luna"; - rev = version; - hash = "sha256-81GJF3QLERCmvZXYlQvb1vzJFeGMSMNMwuGoaBJE8Zg="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; - - pyproject = true; - nativeBuildInputs = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = - [ - amaranth - usb-protocol - ] - ++ (with python3.pkgs; [ - libusb1 - pyserial - pyusb - pyvcd - ]); - }; - luna-soc = python3.pkgs.buildPythonPackage rec { - pname = "luna-soc"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "greatscottgadgets"; - repo = pname; - rev = version; - hash = "sha256-P8P32hM1cVXENcDpCrmPe8BvkMCWdeEgHwbIU94uLe8="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; - - pyproject = true; - nativeBuildInputs = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = [ luna-usb ]; - }; - - version = "0.1.5"; - src = fetchFromGitHub { - owner = "greatscottgadgets"; - repo = "cynthion"; - rev = version; - hash = "sha256-Lx0greHNIE6BAgCp9zZtUx+N+oMMaBZszZLknVZa7TU="; - }; - cynthion = python3.pkgs.buildPythonApplication { - pname = "cynthion"; - inherit version src; - - sourceRoot = "${src.name}/cynthion/python"; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; - - postInstall = '' - install -D assets/54-cynthion.rules $out/lib/udev/rules.d/54-cynthion.rules - ''; - - pyproject = true; - nativeBuildInputs = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = - [ - amaranth - apollo-fpga - pyfwup - pygreat - luna-usb - luna-soc - ] - ++ (with python3.pkgs; [ - future - libusb1 - prompt-toolkit - pyserial - pyusb - tabulate - tomli - tqdm - ]); - }; - cynthion-bitstreams = stdenv.mkDerivation rec { - pname = "cynthion-bistreams"; - inherit version src; - - sourceRoot = "${src.name}/cynthion/python"; - postPatch = '' - substituteInPlace Makefile --replace-fail '/bin/zsh' '${zsh}/bin/zsh' - rm -r assets - mkdir assets - ''; - - nativeBuildInputs = [ - python3 - cynthion - yosys - nextpnr - trellis - ]; - - buildPhase = '' - make bitstreams - ''; - - installPhase = '' - mv assets $out - ''; - }; -in -cynthion.overrideAttrs (attrs: { - postPatch = - attrs.postPatch - + '' - ln -s ${cynthion-bitstreams}/* assets - ''; -}) diff --git a/packages/packetry/default.nix b/packages/packetry/default.nix deleted file mode 100644 index 6ca128b..0000000 --- a/packages/packetry/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - rustPlatform, - fetchFromGitHub, - pkg-config, - gtk4, - pango, -}: - -rustPlatform.buildRustPackage rec { - pname = "packetry"; - version = "unstable-2024-07-08"; - - src = fetchFromGitHub { - owner = "greatscottgadgets"; - repo = pname; - rev = "dffa1bd671ed22cd0b1cdd07c10d1916bea60ba5"; - hash = "sha256-UOn3GevMDRC88MgK7YeIl9AOo6wqRSekA5pLufH3u1k="; - }; - - cargoHash = "sha256-sh3m0AJpR/4w+gqxz84HF5FvvwOHP0G+/GM+X7ep94o="; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gtk4 - pango - ]; - - # Failures from fontconfig in tests - doCheck = false; -}