From 4c670bf3bba4d01cb9cb3f193861725c9dea86a2 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Fri, 6 Dec 2024 18:14:07 -0500 Subject: [PATCH] pkgs: remove bazznix packages --- .github/workflows/nix-build.yml | 42 ----------------------------- flake.nix | 4 --- overlays/default.nix | 3 --- pkgs/adjustor.nix | 36 ------------------------- pkgs/emudeck.nix | 48 --------------------------------- pkgs/hhd-ui.nix | 22 --------------- 6 files changed, 155 deletions(-) delete mode 100644 pkgs/adjustor.nix delete mode 100644 pkgs/emudeck.nix delete mode 100644 pkgs/hhd-ui.nix diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index d87703e7..bf47105a 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -7,20 +7,6 @@ on: - '_img/**' workflow_dispatch: jobs: - adjustor-build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - with: - fetch-depth: 1 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: cachix/cachix-action@master - with: - name: alyraffauf - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Build adjustor package - run: nix build --accept-flake-config .#packages.x86_64-linux.adjustor clean-install-build: runs-on: ubuntu-latest steps: @@ -35,34 +21,6 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Build clean-install package run: nix build --accept-flake-config .#packages.x86_64-linux.clean-install - emudeck-build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - with: - fetch-depth: 1 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: cachix/cachix-action@master - with: - name: alyraffauf - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Build emudeck package - run: nix build --accept-flake-config .#packages.x86_64-linux.emudeck - hhd-ui-build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - with: - fetch-depth: 1 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: cachix/cachix-action@master - with: - name: alyraffauf - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Build hhd-ui package - run: nix build --accept-flake-config .#packages.x86_64-linux.hhd-ui rofi-bluetooth-build: runs-on: ubuntu-latest steps: diff --git a/flake.nix b/flake.nix index 339e03d8..2e7f90e4 100644 --- a/flake.nix +++ b/flake.nix @@ -192,15 +192,11 @@ packages = forAllLinuxSystems ({pkgs}: rec { default = clean-install; - adjustor = pkgs.callPackage ./pkgs/adjustor.nix {}; - clean-install = pkgs.writeShellApplication { name = "clean-install"; text = ./flake/clean-install.sh; }; - emudeck = pkgs.callPackage ./pkgs/emudeck.nix {}; - hhd-ui = pkgs.callPackage ./pkgs/hhd-ui.nix {}; rofi-bluetooth = pkgs.callPackage ./pkgs/rofi-bluetooth.nix {}; }); }; diff --git a/overlays/default.nix b/overlays/default.nix index 16867e24..009c51c6 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,4 @@ # Default overlay. {self}: final: prev: { - adjustor = self.packages.${prev.system}.adjustor; - hhd-ui = self.packages.${prev.system}.hhd-ui; - emudeck = self.packages.${prev.system}.emudeck; rofi-bluetooth = self.packages.${prev.system}.rofi-bluetooth; } diff --git a/pkgs/adjustor.nix b/pkgs/adjustor.nix deleted file mode 100644 index 4bd27593..00000000 --- a/pkgs/adjustor.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - fetchFromGitHub, - lib, - python3, -}: -python3.pkgs.buildPythonApplication rec { - pname = "adjustor"; - version = "3.5.2"; - pyproject = true; - - src = fetchFromGitHub { - hash = "sha256-9ONWKI68Llh36giIS6nVKNrZYmNAGMfwW2vgPMFuwXM="; - owner = "hhd-dev"; - repo = "adjustor"; - rev = "v${version}"; - }; - - propagatedBuildInputs = with python3.pkgs; [ - dbus-python - fuse - pygobject3 - pyroute2 - rich - setuptools - ]; - - # This package doesn't have upstream tests. - doCheck = false; - - meta = with lib; { - description = "TDP control of AMD Handhelds with handheld-daemon."; - homepage = "https://github.com/hhd-dev/adjustor/"; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/pkgs/emudeck.nix b/pkgs/emudeck.nix deleted file mode 100644 index 313dd596..00000000 --- a/pkgs/emudeck.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This is extremely limited and largely proof-of-concept. Many things will simply not work, including Steam ROM Manager. Expect issues. -{ - appimageTools, - fetchurl, - lib, -}: -appimageTools.wrapType2 rec { - pname = "emudeck"; - version = "2.3.0"; - - src = fetchurl { - hash = "sha256-BVlATLKbE9wwMs4844UpXCTZsLW1oRFWf9hujVUpa4k="; - url = "https://github.com/EmuDeck/emudeck-electron/releases/download/v${version}/EmuDeck-${version}.AppImage"; - }; - - extraPkgs = pkgs: - with pkgs; [ - bash - flatpak - fuse2 - git - jq - newt - rsync - unzip - zenity - ]; - - extraInstallCommands = let - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; - in '' - install -m 444 -D ${appimageContents}/emudeck.desktop $out/share/applications/emudeck.desktop - install -m 444 -D ${appimageContents}/emudeck.png \ - $out/share/icons/hicolor/scalable/apps/emudeck.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "EmuDeck utility to manage ROMs on handheld PCs"; - homepage = "https://github.com/EmuDeck/emudeck-electron"; - license = licenses.mit; - mainProgram = "emudeck"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/hhd-ui.nix b/pkgs/hhd-ui.nix deleted file mode 100644 index e46d6e9b..00000000 --- a/pkgs/hhd-ui.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - appimageTools, - fetchurl, - lib, -}: -appimageTools.wrapType2 rec { - pname = "hhd-ui"; - version = "3.2.3"; - - src = fetchurl { - hash = "sha256-VhJrOvE+BebJIAeQlwOOsPfqSrvBnJQavGT7glTrG2o="; - url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/${pname}.AppImage"; - }; - - meta = with lib; { - description = "Graphical user interface for Handheld Daemon settings from Steam Big Picture Mode, the Desktop, and the Web."; - homepage = "https://github.com/hhd-dev/hhd-ui/"; - license = licenses.mit; - mainProgram = "hhd-ui"; - platforms = platforms.linux; - }; -}