diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml index 113f452..72492cf 100644 --- a/.github/workflows/nix.yaml +++ b/.github/workflows/nix.yaml @@ -81,8 +81,6 @@ jobs: - ubuntu-latest needs: - x86_64-linux---packages---pyfdt - - x86_64-linux---packages---pyoxidizer - - x86_64-linux---packages---python-pyoxidizer steps: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v25 diff --git a/flake.nix b/flake.nix index 586d5b1..38bad22 100644 --- a/flake.nix +++ b/flake.nix @@ -19,14 +19,12 @@ { packages = { capDL-tool = pkgs.capDL-tool; - pyoxidizer = pkgs.pyoxidizer; # python dependencies for seL4 # these are not actually part of the nixpkgs, but provided over the default overlay of # this flake guardonce = pkgs.python3Packages.guardonce; pyfdt = pkgs.python3Packages.pyfdt; - python-pyoxidizer = pkgs.python3Packages.pyoxidizer; concurrencytest = pkgs.python3Packages.concurrencytest; seL4-deps = pkgs.python3Packages.seL4-deps; camkes-deps = pkgs.python3Packages.camkes-deps; diff --git a/overlay.nix b/overlay.nix index ed97184..ff78fbe 100644 --- a/overlay.nix +++ b/overlay.nix @@ -29,11 +29,6 @@ final: prev: { microkit-sdk-bin = prev.callPackage pkgs/microkit-sdk-bin.nix { }; - pyoxidizer = prev.callPackage pkgs/pyoxidizer.nix { - pythonPackages = prev.python3Packages; - }; - - # overlay python packages pythonPackagesOverlays = (prev.pythonPackagesOverlays or [ ]) ++ [ (python-final: python-prev: { @@ -41,10 +36,6 @@ final: prev: { pyfdt = python-final.callPackage pkgs/pyfdt.nix { }; - pyoxidizer = python-prev.toPythonModule (final.pyoxidizer.override { - pythonPackages = python-prev; - }); - concurrencytest = python-final.callPackage pkgs/concurrencytest.nix { }; seL4-deps = python-final.callPackage pkgs/seL4-deps.nix { diff --git a/pkgs/pyoxidizer.nix b/pkgs/pyoxidizer.nix deleted file mode 100644 index dc1f46e..0000000 --- a/pkgs/pyoxidizer.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, pythonPackages }: - -rustPlatform.buildRustPackage rec { - pname = "pyoxidizer"; - version = "0.24.0"; - - src = fetchFromGitHub { - owner = "indygreg"; - repo = "PyOxidizer"; - rev = "pyoxidizer/${version}"; - hash = "sha256-SD+e3ufgkNvvvy0JTL+UPo8VRVZiN64W3NuChjhfr6Y="; - }; - cargoHash = "sha256-0f3RKd1LpE/fN0Lhn0lzrWUkOjDFkyGQy/zrMZ6JCck="; - - nativeBuildInputs = [ - pythonPackages.pip - pythonPackages.setuptools - pythonPackages.wheel - ]; - - # build python wheel - postBuild = '' - ${pythonPackages.python.pythonOnBuildForHost.interpreter} -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . - ''; - - # install python wheel - postInstall = '' - ${pythonPackages.python.pythonOnBuildForHost.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache dist/*.whl - ''; - - # TODO investigate test failure: - # - # Running unittests src/lib.rs (target/x86_64-unknown-linux-gnu/release/deps/pyembed-b2e35d9e976473e8) - # running 59 tests - # test config::tests::test_packed_resources_implicit_origin ... ok - # test config::tests::test_packed_resources_explicit_origin ... ok - # test test::importer::find_spec_missing ... FAILED - # test test::importer::importer_resource_reading_py ... FAILED - # test test::importer::importer_pkg_resources_py ... FAILED - # test test::importer::importer_iter_modules_py ... FAILED - # test test::importer::builtins_py ... FAILED - # test test::importer::importer_path_entry_finder_py ... FAILED - # test test::importer::importer_metadata_py ... FAILED - # test test::importer::importer_indexing ... FAILED - # test test::importer::importer_module_py ... FAILED - # test test::importer::importer_resource_collector_py ... FAILED - # test test::importer::importer_construction_py ... FAILED - # test test::importer::importer_module_loading_py ... FAILED - # test test::interpreter_config::test_allocator_debug ... ok - # test test::interpreter_config::test_allocator_default ... ok - # test test::interpreter_config::test_allocator_debug_custom_backend ... ok - # test test::interpreter_config::test_allocator_rust_pymalloc_arena ... ok - # test test::interpreter_config::test_argv_override ... ok - # test test::interpreter_config::test_argv_default ... ok - # test test::interpreter_config::test_argv_respect_interpreter_config ... ok - # test test::interpreter_config::test_allocator_rust ... ok - # test test::interpreter_config::test_argv_utf8 ... ok - # test test::interpreter_config::test_argvb_utf8 ... ok - # test test::interpreter_config::test_argv_utf8_isolated_configure_locale ... FAILED - # test test::interpreter_config::test_argv_utf8_isolated ... ok - # test test::interpreter_config::test_bytes_warning_raise ... ok - # test test::interpreter_config::test_bytes_warning_warn ... ok - # test test::interpreter_config::test_default_interpreter ... ok - # test test::interpreter_config::test_importer_filesystem ... ok - # test test::interpreter_config::test_dev_mode ... ok - # test test::interpreter_config::test_inspect ... ok - # test test::interpreter_config::test_importer_neither ... ok - # test test::interpreter_config::test_isolated_interpreter ... ok - # test test::interpreter_config::test_interactive ... ok - # test test::interpreter_config::test_optimization_level_one ... ok - # test test::interpreter_config::test_sys_paths_origin ... ok - # test test::interpreter_config::test_tcl_library_origin ... ok - # test test::interpreter_config::test_quiet ... ok - # test test::interpreter_config::test_site_import_false ... ok - # test test::interpreter_config::test_optimization_level_two ... ok - # test test::interpreter_config::test_use_environment ... ok - # test test::interpreter_config::test_user_site_directory_false ... ok - # test test::interpreter_config::test_site_import_true ... ok - # test test::interpreter_config::test_utf8_mode ... ok - # test test::interpreter_config::test_user_site_directory_true ... FAILED - # error: test failed, to rerun pass `-p pyembed --lib` - # Caused by: - # process didn't exit successfully: `/build/source/target/x86_64-unknown-linux-gnu/release/deps/pyembed-b2e35d9e976473e8 --test-threads=12` (signal: 11, SIGSEGV: invalid memory reference) - doCheck = false; - - meta = with lib; { - description = "A modern Python application packaging and distribution tool"; - homepage = "https://github.com/indygreg/PyOxidizer"; - license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ wucke13 ]; - }; -}