From b851d4ae01c70ee34b199d862548b83708b724e6 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 18 Nov 2024 11:05:21 -0600 Subject: [PATCH] get crazy and use nixpkgs --- .github/workflows/update.yml | 9 ++++----- flake.lock | 8 ++++---- flake.nix | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 97b85ba..3e30608 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -69,8 +69,8 @@ jobs: --host "othalan" --flake . --debug - -- - --print-build-logs + # -- + # --print-build-logs - name: Commit Updates uses: daylin-bot/actions/commit-and-push@main @@ -126,10 +126,9 @@ jobs: --debug -- --keep-going - --print-build-logs + # --print-build-logs --out-link current - - run: git checkout flake-lock - name: Pre-build oizys @@ -145,7 +144,7 @@ jobs: --debug -- --keep-going - --print-build-logs + # --print-build-logs --out-link updated - run: | diff --git a/flake.lock b/flake.lock index 504a2df..6bc719c 100644 --- a/flake.lock +++ b/flake.lock @@ -792,16 +792,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 161d1af..ed99772 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ outputs = inputs: (import ./lib inputs).oizysFlake; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; stable.url = "github:nixos/nixpkgs/nixos-24.05"; my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";