From 9f178c0de09cc99ecc0c36a7dc8e9335d58d7494 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 17 Feb 2025 18:54:50 -0600 Subject: [PATCH] don't actually depend on nix-eval-jobs --- .github/workflows/update.yml | 5 +++++ pkgs/oizys/default.nix | 14 +------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index afefa6e..93a6a4b 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -43,10 +43,15 @@ jobs: - uses: daylin-bot/actions/setup@main - uses: ./.github/actions/nix + - name: Install nix-eval-jobs + run: | + nix profile install '.#nix-eval-jobs' + # with: # attic_token: ${{ secrets.ATTIC_TOKEN }} # # need ssh access for `oizys cache --service store` + # TODO: use this in actions/nix? - name: Setup SSH uses: MrSquaare/ssh-setup-action@v3 diff --git a/pkgs/oizys/default.nix b/pkgs/oizys/default.nix index 47b3c1e..b405f10 100644 --- a/pkgs/oizys/default.nix +++ b/pkgs/oizys/default.nix @@ -2,9 +2,6 @@ lib, openssl, buildNimblePackage, - - nix-eval-jobs, - makeWrapper, }: buildNimblePackage { @@ -12,19 +9,10 @@ buildNimblePackage { name = "oizys"; version = "unstable"; src = lib.cleanSource ./.; - nativeBuildInputs = [ openssl makeWrapper ]; + nativeBuildInputs = [ openssl]; nimbleDepsHash = "sha256-bthmRlUO6IOYRiwVic0TPOvo0gsfD/49J2GzoIQqlF0="; meta = { description = "nix begat oizys"; }; - postFixup = '' - wrapProgram $out/bin/oizys \ - --set PATH ${ - lib.makeBinPath [ - nix-eval-jobs - ] - } - ''; - }