Skip to content

Commit

Permalink
feat: get rid of pyoxidizer
Browse files Browse the repository at this point in the history
  • Loading branch information
Wanja Zaeske committed May 31, 2024
1 parent 093bc07 commit 5c8bb98
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 105 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 0 additions & 9 deletions overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,13 @@ 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: {
guardonce = python-final.callPackage pkgs/guardonce.nix { };

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 {
Expand Down
92 changes: 0 additions & 92 deletions pkgs/pyoxidizer.nix

This file was deleted.

0 comments on commit 5c8bb98

Please sign in to comment.