From 3ec86ec2a9086b91b924d9baec0118400f491a32 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 14:35:43 +0100 Subject: [PATCH 1/4] pinta: move to pkgs/by-name --- pkgs/{applications/graphics => by-name/pi}/pinta/deps.nix | 0 .../graphics/pinta/default.nix => by-name/pi/pinta/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/graphics => by-name/pi}/pinta/deps.nix (100%) rename pkgs/{applications/graphics/pinta/default.nix => by-name/pi/pinta/package.nix} (100%) diff --git a/pkgs/applications/graphics/pinta/deps.nix b/pkgs/by-name/pi/pinta/deps.nix similarity index 100% rename from pkgs/applications/graphics/pinta/deps.nix rename to pkgs/by-name/pi/pinta/deps.nix diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/by-name/pi/pinta/package.nix similarity index 100% rename from pkgs/applications/graphics/pinta/default.nix rename to pkgs/by-name/pi/pinta/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e361ef82213..fa00018dae2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33336,8 +33336,6 @@ with pkgs; pinpoint = callPackage ../applications/office/pinpoint { }; - pinta = callPackage ../applications/graphics/pinta { }; - pistol = callPackage ../tools/misc/pistol { }; piston-cli = callPackage ../tools/misc/piston-cli { }; From 19353ae38b5731e4596291b5a289fb363473b0c4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 14:40:22 +0100 Subject: [PATCH 2/4] pinta: 2.1.1 -> 2.1.2 --- pkgs/by-name/pi/pinta/deps.nix | 28 ++++++++++++++-------------- pkgs/by-name/pi/pinta/package.nix | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/pi/pinta/deps.nix b/pkgs/by-name/pi/pinta/deps.nix index 5f637d347f5c..6d7e63396d76 100644 --- a/pkgs/by-name/pi/pinta/deps.nix +++ b/pkgs/by-name/pi/pinta/deps.nix @@ -2,18 +2,18 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; sha256 = "12dv3j8nzhjb5c0093djajdnv8n7m0q7vq2d5ry2v4xk9wqzxpr7"; }) - (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; sha256 = "0n3y5w088k81apxik9amfvjdwcic4k2ixxvnrk9cw6d2wh1d5r8d"; }) - (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; sha256 = "0c5gzg106bnnc4wwwhch6lja68623a9hk8r2sjcv35hl5dh21616"; }) - (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; sha256 = "1b3irarxjbbpf24fw2avdglcslb5653gn6m829yhlcm5ay37pds4"; }) - (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; sha256 = "1a0ixdq1gdb46gkb2nnlydsi10bjrbd3risfyaphsy8fbsyzrzvm"; }) - (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; sha256 = "0cn8aggci6n088y5giiaxmyzv01rcz37r8pm738q2bsb57zppz2j"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "NGettext"; version = "0.6.7"; sha256 = "1lnq1lgd80xqn80qwq5ipfjnd7nl1ghinjc3krnd546r0c7hwqky"; }) - (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; sha256 = "0cma8j4cy4j3fw0nvsxlqi0azjkvfjsw0wb6k6b2k21rdpy5rbbn"; }) - (fetchNuGet { pname = "ParagonClipper"; version = "6.4.2"; sha256 = "0pam44f7iayqjz8nh1x29gxdd4dj00i7m5883cpa64i192pgl94c"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; sha256 = "1dh1jhgzc9bzd2hvyjp2nblavf0619djniyzalx7kvrbsxhrdjb6"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.11.0"; sha256 = "067s9i5mjxlmw0nid3fblr9d0hy1b6zrjzhhi48rf4cs2j72pl64"; }) + (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; hash = "sha256-J9/+MU+zky18Lk3gfTCox6Jtm1SyjQQAK0vCb5Ecu4k="; }) + (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; hash = "sha256-DeXSAuSiGc7SzHb3HsUkLDLe5HZVpRn7VQFNhAAvflg="; }) + (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; hash = "sha256-JpggYCsUlrGZ1CKjCZMawiCjJDWQQc45YdYuA8L7rzA="; }) + (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; hash = "sha256-RLd7hlelMgp9Eqga+0YxZVHN6GtbCe6IcHct2bPKcaw="; }) + (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; hash = "sha256-df/8vV4OeQ2v8k7HPNrKcoEQdfPUWrHmM2S1F3DrEag="; }) + (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; hash = "sha256-Uvx7/ylLL4HROPWifMZnOYD9fe0qxlc8QsCayN5TyDI="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "NGettext"; version = "0.6.7"; hash = "sha256-fmIODwPZkNJsnoNJG+EL1J5mpbuxYI4BsrgD1B4N2NI="; }) + (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; hash = "sha256-dq1c/G05iCmWmWZxwLV0e8qvQMS0620Bd0MSz4hEqjI="; }) + (fetchNuGet { pname = "ParagonClipper"; version = "6.4.2"; hash = "sha256-jCT6rkghEqMuGwiVeiIAspHW+kuiB2jRl9ireBwhVV0="; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; hash = "sha256-ZsmWYdcr73k6Vd9HK1sKBrit6LLiSr+haH8l9h+UAbY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; hash = "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.11.0"; hash = "sha256-xNArjhSaEZcRiRB+mb9ZwUPQUqbLjRYt4JV2WUtM+hg="; }) ] diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index 7f9c815eff1f..ea8ff4ec20b8 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -10,15 +10,15 @@ buildDotnetModule rec { pname = "Pinta"; - version = "2.1.1"; + version = "2.1.2"; nativeBuildInputs = [ intltool wrapGAppsHook3 ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; runtimeDeps = [ gtk3 ]; buildInputs = runtimeDeps; @@ -35,12 +35,12 @@ buildDotnetModule rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - hash = "sha256-sdSGBf/dk+3Oy/aCfmIDuymwXQZwnth923Wdggir/Q0="; + hash = "sha256-/GMYF7G469oX5W1zjv5A9a6tcLX+4g6Sf9cDqxSjgWg="; }; # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + env.LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; # Do the autoreconf/Makefile job manually # TODO: use upstream build system From 684bb61aec1286a5013053f4c8856f587fa4c999 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 14:40:54 +0100 Subject: [PATCH 3/4] pinta: reformat for RFC166 --- pkgs/by-name/pi/pinta/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index ea8ff4ec20b8..8dce17f0ac78 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -1,11 +1,12 @@ -{ lib -, buildDotnetModule -, dotnetCorePackages -, fetchFromGitHub -, glibcLocales -, gtk3 -, intltool -, wrapGAppsHook3 +{ + lib, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + glibcLocales, + gtk3, + intltool, + wrapGAppsHook3, }: buildDotnetModule rec { From 1cfa221982663dc3f9707df6ca90273b68b8ce2e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 15 Jul 2024 14:44:39 +0100 Subject: [PATCH 4/4] pinta: add meta.changelog --- pkgs/by-name/pi/pinta/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index 8dce17f0ac78..d6d27d09ce80 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -80,12 +80,13 @@ buildDotnetModule rec { -p:InstallPrefix="$out" ''; - meta = with lib; { + meta = { homepage = "https://www.pinta-project.com/"; description = "Drawing/editing program modeled after Paint.NET"; - license = licenses.mit; - maintainers = with maintainers; [ thiagokokada ]; - platforms = with platforms; linux; + changelog = "https://github.com/PintaProject/Pinta/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thiagokokada ]; + platforms = lib.platforms.linux; mainProgram = "pinta"; }; }