ciderpress2: init at 1.1.0

(cherry picked from commit c9882aa83b)
This commit is contained in:
Eric Helgeson
2025-08-23 12:20:28 -05:00
committed by github-actions[bot]
parent 567cb1b271
commit fa6d8afce0
2 changed files with 206 additions and 0 deletions

View File

@@ -0,0 +1,44 @@
{
lib,
buildDotnetModule,
fetchFromGitHub,
}:
buildDotnetModule rec {
pname = "ciderpress2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "fadden";
repo = "CiderPress2";
tag = "v${version}";
hash = "sha256-nzCuKCntqYVhjSHljPkY5ziAjYH/qGUqukRPrHzhOzo=";
};
projectFile = [ "cp2/cp2.csproj" ];
executables = [ "cp2" ];
patches = [ ./retarget-net8.patch ];
preBuild = ''
# Disable MS telemetry
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_NOLOGO=1
'';
meta = {
description = "File archive utility for Apple II disk images and file archives";
longDescription = ''
CiderPress 2 is a file archive utility for Apple II disk images and file
archives. It can extract files from disk images and file archives, and
create new archives.
'';
homepage = "https://github.com/fadden/CiderPress2";
changelog = "https://github.com/fadden/CiderPress2/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ nulleric ];
platforms = lib.platforms.unix;
mainProgram = "cp2";
};
}

View File

@@ -0,0 +1,162 @@
From 4b97c8cc49ee2068198bbfaa7eacb17cf1cf067c Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Fri, 22 Aug 2025 10:05:56 -0500
Subject: [PATCH] Retarget to .NET 8
---
AppCommon/AppCommon.csproj | 2 +-
CommonUtil/CommonUtil.csproj | 2 +-
DiskArc/DiskArc.csproj | 2 +-
DiskArcTests/DiskArcTests.csproj | 2 +-
Examples/AddFile/AddFile.csproj | 2 +-
Examples/ListContents/ListContents.csproj | 2 +-
FileConv/FileConv.csproj | 2 +-
FileConvTests/FileConvTests.csproj | 2 +-
MakeDist/MakeDist.csproj | 2 +-
cp2/cp2.csproj | 2 +-
cp2_wpf/cp2_wpf.csproj | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/AppCommon/AppCommon.csproj b/AppCommon/AppCommon.csproj
index 48e8e5c..1e58dc6 100644
--- a/AppCommon/AppCommon.csproj
+++ b/AppCommon/AppCommon.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/CommonUtil/CommonUtil.csproj b/CommonUtil/CommonUtil.csproj
index 132c02c..30402ac 100644
--- a/CommonUtil/CommonUtil.csproj
+++ b/CommonUtil/CommonUtil.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/DiskArc/DiskArc.csproj b/DiskArc/DiskArc.csproj
index a1c95f7..cc0baef 100644
--- a/DiskArc/DiskArc.csproj
+++ b/DiskArc/DiskArc.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/DiskArcTests/DiskArcTests.csproj b/DiskArcTests/DiskArcTests.csproj
index 521776e..40db439 100644
--- a/DiskArcTests/DiskArcTests.csproj
+++ b/DiskArcTests/DiskArcTests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/Examples/AddFile/AddFile.csproj b/Examples/AddFile/AddFile.csproj
index 09d4137..690e75b 100644
--- a/Examples/AddFile/AddFile.csproj
+++ b/Examples/AddFile/AddFile.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/Examples/ListContents/ListContents.csproj b/Examples/ListContents/ListContents.csproj
index 1e27d16..ea1a510 100644
--- a/Examples/ListContents/ListContents.csproj
+++ b/Examples/ListContents/ListContents.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/FileConv/FileConv.csproj b/FileConv/FileConv.csproj
index 4c2e0e7..f44d628 100644
--- a/FileConv/FileConv.csproj
+++ b/FileConv/FileConv.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/FileConvTests/FileConvTests.csproj b/FileConvTests/FileConvTests.csproj
index 48e8e5c..1e58dc6 100644
--- a/FileConvTests/FileConvTests.csproj
+++ b/FileConvTests/FileConvTests.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/MakeDist/MakeDist.csproj b/MakeDist/MakeDist.csproj
index 7bcab19..69753a9 100644
--- a/MakeDist/MakeDist.csproj
+++ b/MakeDist/MakeDist.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
diff --git a/cp2/cp2.csproj b/cp2/cp2.csproj
index cdcac51..45234aa 100644
--- a/cp2/cp2.csproj
+++ b/cp2/cp2.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<StartupObject>cp2.CP2Main</StartupObject>
diff --git a/cp2_wpf/cp2_wpf.csproj b/cp2_wpf/cp2_wpf.csproj
index bdfe5cc..9f5ed90 100644
--- a/cp2_wpf/cp2_wpf.csproj
+++ b/cp2_wpf/cp2_wpf.csproj
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFramework>net6.0-windows</TargetFramework>
+ <TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
<AssemblyName>CiderPress2</AssemblyName>