From ab77858eda4da09d104922a18ff09971899877d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sun, 16 Aug 2026 10:37:49 -0600 Subject: [PATCH] gitea action --- .gitea/workflows/build.yaml | 11 +++++++++++ default.nix | 13 ++++++++----- flake.lock | 16 ++++++++++++++++ flake.nix | 10 +++++++--- 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 .gitea/workflows/build.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml new file mode 100644 index 0000000..6e3b273 --- /dev/null +++ b/.gitea/workflows/build.yaml @@ -0,0 +1,11 @@ +name: build +on: [push] + +jobs: + build: + runs-on: nixos + steps: + - name: Check out repository code + uses: actions/checkout@v4 + - name: build wiktlarp + run: nix build -L .#wiktlarp diff --git a/default.nix b/default.nix index 23d5301..56d7e8c 100644 --- a/default.nix +++ b/default.nix @@ -1,9 +1,12 @@ -{ rustPlatform +{ crane-lib +, lib }: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "wiktlarp-tf2"; +crane-lib.buildPackage (lib.fix (finalAttrs: { + pname = "wiktlarp"; version = "0.1.0"; src = ./.; - cargoLock.lockFile = ./Cargo.lock; -}) + # cargoLock.lockFile = ./Cargo.lock; + doCheck = true; + meta.mainProgram = "wiktlarp"; +})) diff --git a/flake.lock b/flake.lock index 6b92e8a..f2f3b06 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,20 @@ { "nodes": { + "crane": { + "locked": { + "lastModified": 1785782307, + "narHash": "sha256-MPaRdVkf6zZP5fCPxYCi8Dr4pZzgmXzg8T9nVEbp3Mw=", + "owner": "ipetkov", + "repo": "crane", + "rev": "2c71e194474d13de031d729b729c968ddbe3507f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1775095191, @@ -18,6 +33,7 @@ }, "root": { "inputs": { + "crane": "crane", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 9e4e480..0ad220d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + crane.url = "github:ipetkov/crane"; }; outputs = { self, nixpkgs, ... }@inputs: @@ -23,10 +24,13 @@ # Exposed as a REPL convenience. _pkgs = each-system ({ pkgs, ... }: pkgs); - packages = each-system ({ pkgs, ... }: { - default = pkgs.callPackage ./default.nix {}; + packages = each-system ({ pkgs, lib, ... }: (lib.fix (p: { + default = p.wiktlarp; + wiktlarp = pkgs.callPackage ./default.nix { + crane-lib = inputs.crane.mkLib pkgs; + }; db = pkgs.callPackage ./db {}; - }); + }))); devShells = each-system ({ pkgs, system, ... }: { default = pkgs.mkShell {