Skip to content

Commit 37aabe8

Browse files
authored
pablodraw: 3.3.13-beta -> 3.1.14-beta, .NET 7 -> .NET 9 (#390735)
2 parents f73d60c + d7e11fa commit 37aabe8

File tree

2 files changed

+134
-50
lines changed

2 files changed

+134
-50
lines changed

pkgs/by-name/pa/pablodraw/deps.json

Lines changed: 99 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,49 @@
1-
{ lib
2-
, buildDotnetModule
3-
, fetchFromGitHub
4-
, dotnetCorePackages
5-
, wrapGAppsHook3
6-
, copyDesktopItems
7-
, gtk3
8-
, libnotify
9-
, makeDesktopItem
10-
, stdenv
1+
{
2+
lib,
3+
buildDotnetModule,
4+
fetchFromGitHub,
5+
dotnetCorePackages,
6+
wrapGAppsHook3,
7+
copyDesktopItems,
8+
gtk3,
9+
libnotify,
10+
makeDesktopItem,
11+
stdenv,
1112
}:
1213

1314
buildDotnetModule rec {
1415
pname = "pablodraw";
15-
version = "3.3.13-beta";
16+
version = "3.1.14-beta";
1617

1718
src = fetchFromGitHub {
1819
owner = "cwensley";
1920
repo = "pablodraw";
20-
rev = version;
21-
hash = "sha256-PsCFiNcWYh6Bsf5Ihi3IoYyv66xUT1cRBKkx+K5gB/M=";
21+
tag = version;
22+
hash = "sha256-p2YeWC3ZZOI5zDpgDmEX3C5ByAAjLxJ0CqFAqKeoJ0Q=";
2223
};
2324

24-
postPatch = ''
25-
substituteInPlace ${projectFile} \
26-
--replace-warn '<EnableCompressionInSingleFile>True</EnableCompressionInSingleFile>' ""
27-
'';
28-
2925
projectFile = "Source/PabloDraw/PabloDraw.csproj";
3026

3127
executables = [ "PabloDraw" ];
3228

33-
dotnet-sdk = dotnetCorePackages.sdk_7_0-bin;
34-
dotnet-runtime = dotnetCorePackages.runtime_7_0-bin;
29+
dotnet-sdk = dotnetCorePackages.sdk_9_0;
30+
dotnet-runtime = dotnetCorePackages.runtime_9_0;
3531

3632
nugetDeps = ./deps.json;
3733

38-
nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems ];
34+
dotnetFlags = [
35+
"-p:EnableCompressionInSingleFile=false"
36+
];
37+
38+
nativeBuildInputs = [
39+
wrapGAppsHook3
40+
copyDesktopItems
41+
];
3942

40-
runtimeDeps = [ gtk3 libnotify ];
43+
runtimeDeps = [
44+
gtk3
45+
libnotify
46+
];
4147

4248
desktopItems = [
4349
(makeDesktopItem {
@@ -57,13 +63,16 @@ buildDotnetModule rec {
5763
install -Dm644 Assets/PabloDraw-64.png $out/share/icons/hicolor/64x64/apps/pablodraw.png
5864
'';
5965

60-
meta = with lib; {
66+
meta = {
6167
description = "Ansi/Ascii text and RIPscrip vector graphic art editor/viewer with multi-user capabilities";
6268
homepage = "https://picoe.ca/products/pablodraw";
63-
license = licenses.mit;
69+
license = lib.licenses.mit;
6470
mainProgram = "PabloDraw";
65-
maintainers = with maintainers; [ aleksana kip93 ];
66-
platforms = platforms.all;
71+
maintainers = with lib.maintainers; [
72+
aleksana
73+
kip93
74+
];
75+
platforms = lib.platforms.all;
6776
broken = stdenv.hostPlatform.isDarwin; # Eto.Platform.Mac64 not found in nugetSource
6877
};
6978
}

0 commit comments

Comments
 (0)