diff --git a/flake.lock b/flake.lock index 350c4dd1..384bd275 100644 --- a/flake.lock +++ b/flake.lock @@ -915,7 +915,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-gitea": { "locked": { "lastModified": 1790323409, "narHash": "sha256-VVTPf+Hyd5ebpjBMHmrLMSBIeW6ls48Bqtosj7CNKLA=", @@ -931,6 +931,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "25f538306313eae3927264466c70d7001dcea1df", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -1018,6 +1034,7 @@ "nixos-mailserver": "nixos-mailserver", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_2", + "nixpkgs-gitea": "nixpkgs-gitea", "nixvim": "nixvim", "rust-overlay": "rust-overlay_2", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index e4a3ce44..a76613a4 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,8 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs-gitea.url = "github:NixOS/nixpkgs/nixos-unstable"; rust-overlay = { url = "github:oxalica/rust-overlay"; inputs = { diff --git a/package/default.nix b/package/default.nix index 96e3e1cb..459dcd11 100644 --- a/package/default.nix +++ b/package/default.nix @@ -1,4 +1,8 @@ -{ self, pkgs, inputs, ... }: let +{ self, pkgs, inputs, system, ... }: let + giteaPkgs = import inputs.nixpkgs-gitea { + inherit system; + config = pkgs.config; + }; rust = { nativeBuildInputs = [ pkgs.pkgsBuildHost.rust-bin.stable."1.81.0".default @@ -135,7 +139,9 @@ in { c-hectic = pkgs.callPackage ./c/hectic/default.nix {}; watch = pkgs.callPackage ./c/watch/default.nix {}; support-bot = pkgs.callPackage ./support-bot {}; - gitea-heatmap = pkgs.callPackage ./gitea {}; + gitea-heatmap = giteaPkgs.callPackage ./gitea { + nixosTests = pkgs.nixosTests; + }; gitea-runner-nix-image = pkgs.callPackage ./gitea-runner-nix-image {}; gitea-runner-controller = pkgs.callPackage ./gitea-runner-controller {}; nix-derivation-hash = pkgs.callPackage ./nix-derivation-hash {};