From 6a6b65d1b391a48bd6b4b2f85a9a9465e67accea Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 30 Jul 2025 19:26:26 -0400 Subject: [PATCH] build: Update nix config. Start building 0.2025.8, switching to calver. --- GNUmakefile | 6 +++--- default.nix | 4 ++-- flake.lock | 6 +++--- src/android/AndroidManifest.xml | 4 ++-- src/ios/Info.plist | 4 ++-- src/version.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 88e94dca..f3b11d8c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,9 +16,9 @@ MAKEFLAGS += --no-builtin-rules ## LD := Linker. ## ANDROID_SDK := Path to the Android SDK. -VERSION_CODE := 40 -VERSION_CODE_IOS := 15 -VERSION_NUMBER := 0.0.33 +VERSION_CODE := 41 +VERSION_CODE_IOS := 16 +VERSION_NUMBER := 0.2025.8-wip VERSION_NAME := This program kills fascists. IPHONEOS_VERSION_MIN=14.0 diff --git a/default.nix b/default.nix index 98a8f21e..0dc336f2 100644 --- a/default.nix +++ b/default.nix @@ -25,14 +25,14 @@ }: pkgs.stdenv.mkDerivation rec { pname = "tildefriends"; - version = "0.0.32"; + version = "0.0.33"; src = pkgs.fetchFromGitea { domain = "dev.tildefriends.net"; owner = "cory"; repo = "tildefriends"; rev = "v${version}"; - hash = "sha256-Dk0NOEQIg2LeENySK0+MgpZEtfsClGq6dZL+eOOpE0U="; + hash = "sha256-9D28gmaBTRVyXhY3zZd/W9PsXA1YZt/K69hz41aVP04="; fetchSubmodules = true; }; diff --git a/flake.lock b/flake.lock index 32cb0421..fa4c1dc0 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml index da40e6c2..f812a9ea 100644 --- a/src/android/AndroidManifest.xml +++ b/src/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="41" + android:versionName="0.2025.8-wip"> CFBundlePackageType APPL CFBundleShortVersionString - 0.0.33 + 0.2025.8 CFBundleSupportedPlatforms iPhoneOS CFBundleVersion - 15 + 16 DTPlatformName iphoneos LSRequiresIPhoneOS diff --git a/src/version.h b/src/version.h index d84e8a8f..21b6f480 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION_NUMBER "0.0.33" +#define VERSION_NUMBER "0.2025.8-wip" #define VERSION_NAME "This program kills fascists."