From 903b3aea98af8f454d72155aa667711a4630e901 Mon Sep 17 00:00:00 2001 From: specCon18 Date: Sat, 21 Jun 2025 04:20:18 -0400 Subject: [PATCH 1/3] nixified --- flake.nix | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++ go.mod | 2 +- package.nix | 25 +++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 flake.nix create mode 100644 package.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..65a2e6a --- /dev/null +++ b/flake.nix @@ -0,0 +1,59 @@ +{ + description = "An api to check when the ArmA reforger Dedicated Server needs updated"; + + # Nixpkgs / NixOS version to use. + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + + outputs = + { self, nixpkgs }: + let + # System types to support. + supportedSystems = [ + "x86_64-linux" + ]; + + # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + + # Nixpkgs instantiated for supported system types. + nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); + + in + { + + # Provide some binary packages for selected system types by mapping over each system architecture. + packages = forAllSystems ( + system: + let + # Set pkgs = the correct version for a given architecture. + pkgs = nixpkgsFor.${system}; + in + { + reforger-update-api = pkgs.callPackage ./package.nix { }; + } + ); + + # Add dependencies that are only needed for development, this also allows for nix develop command to launch a devshell + devShells = forAllSystems ( + system: + let + pkgs = nixpkgsFor.${system}; + in + { + default = pkgs.mkShell { + buildInputs = with pkgs; [ + go + gopls + gotools + go-tools + ]; + }; + } + ); + + # The default package for 'nix build'. This makes sense if the + # flake provides only one package or there is a clear "main" + # package. + defaultPackage = forAllSystems (system: self.packages.${system}.reforger-update-api); + }; +} diff --git a/go.mod b/go.mod index 500f699..88c9af1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module armareforger_update_checker +module reforger-update-api go 1.23.8 diff --git a/package.nix b/package.nix new file mode 100644 index 0000000..0b5c7cc --- /dev/null +++ b/package.nix @@ -0,0 +1,25 @@ +{ buildGoModule }: +# This is the wrapping around mkderivation that abstracts away the standard boilerplate logic for building go packages. +buildGoModule { + # The final built binary name. + pname = "reforger-update-api"; + # The binary version | NEEDS TO BE IN STEP WITH GO MOD. + version = "1.0.0"; + # In 'nix develop', we don't need a copy of the source tree + # in the Nix store. + src = builtins.path { + name = "source"; + path = ./.; + }; + + # This hash locks the dependencies of this package. It is + # necessary because of how Go requires network access to resolve + # VCS. See https://www.tweag.io/blog/2021-03-04-gomod2nix/ for + # details. Normally one can build with a fake hash and rely on native Go + # mechanisms to tell you what the hash should be or determine what + # it should be "out-of-band" with other tooling (eg. gomod2nix). + # To begin with it is recommended to set this, but one must + # remember to bump this hash when your dependencies change. + # vendorHash = pkgs.lib.fakeHash; + vendorHash = null; +} From ceb01ce39a0a0f840e7cd954b1225f289b1a4cc4 Mon Sep 17 00:00:00 2001 From: specCon18 Date: Sun, 22 Jun 2025 02:07:11 -0400 Subject: [PATCH 2/3] fixed vendor error --- .gitignore | 1 + package.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e01ed50..5c032ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ STEAM_API/ +result diff --git a/package.nix b/package.nix index 0b5c7cc..39a1891 100644 --- a/package.nix +++ b/package.nix @@ -21,5 +21,5 @@ buildGoModule { # To begin with it is recommended to set this, but one must # remember to bump this hash when your dependencies change. # vendorHash = pkgs.lib.fakeHash; - vendorHash = null; + vendorHash = "sha256-8kzKNAzXcSxNSY+8H/PbYVV0J2p9q1dn1pbt7lo3g5o="; } From 48e19d11f150f4c0d42d65187aaff7c7bba267da Mon Sep 17 00:00:00 2001 From: steven carpenter Date: Mon, 30 Jun 2025 17:12:36 -0400 Subject: [PATCH 3/3] added .envrc --- .direnv/flake-profile | 1 + .direnv/flake-profile-1-link | 1 + .envrc | 1 + flake.lock | 27 +++++++++++++++++++++++++++ 4 files changed, 30 insertions(+) create mode 120000 .direnv/flake-profile create mode 120000 .direnv/flake-profile-1-link create mode 100644 .envrc create mode 100644 flake.lock diff --git a/.direnv/flake-profile b/.direnv/flake-profile new file mode 120000 index 0000000..0c05709 --- /dev/null +++ b/.direnv/flake-profile @@ -0,0 +1 @@ +flake-profile-1-link \ No newline at end of file diff --git a/.direnv/flake-profile-1-link b/.direnv/flake-profile-1-link new file mode 120000 index 0000000..6c61e9c --- /dev/null +++ b/.direnv/flake-profile-1-link @@ -0,0 +1 @@ +/nix/store/m01jvri2p9cbj0i056hcgax7c8sq1isl-nix-shell-env \ No newline at end of file diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..6047a9b --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +}