Unverified Commit aed46dcb authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #327375 from thiagokokada/pinta-bump 

pinta: 2.1.1 -> 2.1.2
parents c3145169 1cfa2219

pkgs/applications/graphics/pinta/deps.nix

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
# This file was automatically generated by passthru.fetch-deps.

# 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"; })

]

pkgs/by-name/pi/pinta/deps.nix

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# This file was automatically generated by passthru.fetch-deps.

# Please dont edit it manually, your changes might get overwritten!



{ fetchNuGet }: [

  (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="; })

]

pkgs/applications/graphics/pinta/default.nix→pkgs/by-name/pi/pinta/package.nix

+19 −17
Original line number Diff line number Diff line 
{ lib

, buildDotnetModule

, dotnetCorePackages

, fetchFromGitHub

, glibcLocales

, gtk3

, intltool

, wrapGAppsHook3

{

  lib,

  buildDotnetModule,

  dotnetCorePackages,

  fetchFromGitHub,

  glibcLocales,

  gtk3,

  intltool,

  wrapGAppsHook3,

}:



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 +36,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
@@ -79,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";

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -33319,8 +33319,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 { };