irpf: init at 2022-1.0 #163352

AtilaSaraiva · 2022-03-08T16:58:39Z

Description of changes

I wrote this derivation to be able to use the software to write and submit income tax reports officially in my country, Brazil. I hope it can help my nix maniacs compatriots.

Things done

hqurve

Also, is the site guarded? (I am unable to access it)

hqurve · 2022-03-08T18:51:13Z

pkgs/applications/finance/irpf/default.nix

+in
+stdenvNoCC.mkDerivation rec {
+  pname = "irpf";
+  version = "2.22.1.0";


Suggested change

version = "2.22.1.0";

version = "2022-1.0";

Thx for the review!

What website? the one for the pkgbuild or the homepage for the software?

https://downloadirpf.receita.fazenda.gov.br/irpf/2022/irpf/arquivos/IRPF2022-1.0.zip

When i initially commented, I was getting a server not found error, so I assumed maybe they only allow downloads if its from brazil.

But now its working, (either my internet or the site was temporarily down)

Ahh ok, this website is not the most stable for sure.

hqurve · 2022-03-08T18:54:15Z

pkgs/applications/finance/irpf/default.nix

+{ lib, stdenvNoCC, jdk11, makeWrapper, hicolor-icon-theme, fetchzip, fetchgit }:
+
+let
+  year = "2022";


Suggested change

year = "2022";

hqurve · 2022-03-08T19:05:03Z

pkgs/applications/finance/irpf/default.nix

+  src = fetchzip rec {
+    url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${year}-1.0.zip";


Suggested change

src = fetchzip rec {

url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${year}-1.0.zip";

src = let

year = lib.head (lib.splitVersion version);

in fetchzip {

url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip";

hm, I didn't even know this was possible. Thx!

hqurve · 2022-03-08T19:09:15Z

pkgs/applications/finance/irpf/default.nix

+    cp -rf help "$BASEDIR/"
+    cp -rf lib "$BASEDIR/"
+    cp -rf lib-modulos "$BASEDIR/"


Suggested change

cp -rf help "$BASEDIR/"

cp -rf lib "$BASEDIR/"

cp -rf lib-modulos "$BASEDIR/"

cp -rf help lib lib-modulos "$BASEDIR"

Also, would you mind adding a comment as to why the f flag is used here?

Actually I just copied from the arch linux pkgbuild, but it seems indeed unecessary.

hqurve · 2022-03-08T19:10:27Z

pkgs/applications/finance/irpf/default.nix

+    install -Dm644 Leia-me.htm "$BASEDIR/"
+    install -Dm644 offline.png "$BASEDIR/"
+    install -Dm644 online.png "$BASEDIR/"
+    install -Dm644 pgd-updater.jar "$BASEDIR/"


Suggested change

install -Dm644 Leia-me.htm "$BASEDIR/"

install -Dm644 offline.png "$BASEDIR/"

install -Dm644 online.png "$BASEDIR/"

install -Dm644 pgd-updater.jar "$BASEDIR/"

install -Dm644 Leia-me.htm offline.png online.png pgd-updater "$BASEDIR"

(btw, i dont think trailing /'s matter here)

hqurve · 2022-03-08T21:50:37Z

pkgs/applications/finance/irpf/default.nix

+{ lib, stdenvNoCC, jdk11, makeWrapper, hicolor-icon-theme, fetchzip, fetchgit }:
+
+let
+  pkgbuild = fetchgit rec {


Suggested change

pkgbuild = fetchgit rec {

pkgbuild = fetchgit {

hqurve · 2022-03-08T21:50:42Z

pkgs/applications/finance/irpf/default.nix

+in
+stdenvNoCC.mkDerivation rec {
+  pname = "irpf";
+  version = "2022.1.0";


Suggested change

version = "2022.1.0";

version = "2022-1.0";

hqurve · 2022-03-08T21:50:53Z

pkgs/applications/finance/irpf/default.nix

+  src = let
+    year = lib.head (lib.splitVersion version);
+  in fetchzip {
+    url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${year}-1.0.zip";


Suggested change

url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${year}-1.0.zip";

url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip";

hqurve · 2022-03-08T21:56:12Z

pkgs/applications/finance/irpf/default.nix

+      --add-flags "-Dawt.useSystemAAFontSettings=on \
+      -Dswing.aatext=true \
+      -jar $BASEDIR/${pname}.jar" \


Suggested change

--add-flags "-Dawt.useSystemAAFontSettings=on \

-Dswing.aatext=true \

-jar $BASEDIR/${pname}.jar" \

--add-flags "-Dawt.useSystemAAFontSettings=on" \

--add-flags "-Dswing.aatext=true" \

--add-flags "-jar $BASEDIR/${pname}.jar" \

I find this makes it more clear that these flags are not directly being added to makeWrapper

hqurve · 2022-03-08T21:57:03Z

pkgs/applications/finance/irpf/default.nix

+  '';
+
+  meta = with lib; {
+    descriptions = "Programa Oficial da Receita para elaboração do IRPF";


Suggested change

descriptions = "Programa Oficial da Receita para elaboração do IRPF";

description = "Programa Oficial da Receita para elaboração do IRPF";

ofborg detected this

hqurve · 2022-03-08T21:59:39Z

pkgs/applications/finance/irpf/default.nix

+      --add-flags "-Dawt.useSystemAAFontSettings=on \
+      -Dswing.aatext=true \
+      -jar $BASEDIR/${pname}.jar" \
+      --prefix _JAVA_AWT_WM_NONREPARENTING=1 AWT_TOOLKIT=MToolkit


Suggested change

--prefix _JAVA_AWT_WM_NONREPARENTING=1 AWT_TOOLKIT=MToolkit

--set _JAVA_AWT_WM_NONREPARENTING 1 \

--set AWT_TOOLKIT MToolkit

see arguments here https://github.com/NixOS/nixpkgs/blob/c8b5c9526415905e90e3a64586ebecc55a2827dd/pkgs/build-support/setup-hooks/make-wrapper.sh.

hqurve · 2022-03-08T22:00:32Z

pkgs/applications/finance/irpf/default.nix

+    mkdir -p "$out/share/icons/hicolor/128x128/apps"
+    mkdir -p "$out/share/applications"
+    mkdir -p "$out/share/licenses/${pname}"
+    mkdir -p "$out/share/${pname}"
+    mkdir "$out/bin"
+    BASEDIR="$out/share/${pname}"


Suggested change

mkdir -p "$out/share/icons/hicolor/128x128/apps"

mkdir -p "$out/share/applications"

mkdir -p "$out/share/licenses/${pname}"

mkdir -p "$out/share/${pname}"

mkdir "$out/bin"

BASEDIR="$out/share/${pname}"

BASEDIR="$out/share/${pname}"

mkdir -p "$BASEDIR"

I think placing the mkdirs where needed is neater (also install -D makes directories when target directory is specified)

hqurve · 2022-03-08T22:04:46Z

pkgs/applications/finance/irpf/default.nix

+
+    install -Dm755 irpf.jar "$BASEDIR/${pname}.jar"
+    install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR"
+


Suggested change

mkdir -p $out/bin

Yeah indeed this isnt required makeWrapper does this. (my bad)

nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh

Line 91 in c8b5c95

mkdir -p "$(dirname "$wrapper")"

haha, I actually discovered it by accident.

hqurve · 2022-03-08T22:12:08Z

pkgs/applications/finance/irpf/default.nix

+    BASEDIR="$out/share/${pname}"
+
+    cp -r help lib lib-modulos "$BASEDIR"
+


Suggested change

hqurve · 2022-03-08T22:13:31Z

pkgs/applications/finance/irpf/default.nix

+    install -Dm644 ${pkgbuild}/irpf.png $out/share/icons/hicolor/128x128/apps/
+    install -Dm644 ${pkgbuild}/irpf.desktop $out/share/applications/
+    install -Dm644 ${pkgbuild}/Copyright $out/share/licenses/${pname}/


Suggested change

install -Dm644 ${pkgbuild}/irpf.png $out/share/icons/hicolor/128x128/apps/

install -Dm644 ${pkgbuild}/irpf.desktop $out/share/applications/

install -Dm644 ${pkgbuild}/Copyright $out/share/licenses/${pname}/

install -Dtm644 $out/share/icons/hicolor/128x128/apps ${pkgbuild}/irpf.png

install -Dtm644 $out/share/applications ${pkgbuild}/irpf.desktop

install -Dtm644 $out/share/licenses/${pname} ${pkgbuild}/Copyright

This auto creates the directories

I tried this and it didn't work, but I implemented something that will.

AtilaSaraiva · 2022-03-08T22:43:04Z

Thanks for the suggestions! I think I fixed it all. I was actually struggling on how to make the install phase smaller and u gave it to me, thx!

AtilaSaraiva · 2022-03-08T22:46:25Z

Oh miss clicked the close button

AndersonTorres · 2022-03-09T00:25:38Z

pkgs/applications/finance/irpf/default.nix

+{ lib, stdenvNoCC, jdk11, makeWrapper, hicolor-icon-theme, fetchzip, fetchgit }:
+
+let
+  pkgbuild = fetchgit {


What is the meaning of life of this?

Thx for the review again Anderson, I was waiting for someone to ask as this has to do with the reproducibility of this derivation. There are three files I'm getting from the aur pkgbuild: copyright file, the desktop file and the desktop icon. I could forgo the first two since they are text files, as I could either hardcode them or use the proper tools like makeDesktopItem. However, the desktop icon should be hosted in a website whereas it can be fetched using the same url for at least 10 years. Having this in mind, fetching the icon from the government website seems prone to failure, as they can, and most likely will, change urls.

I thought about creating a personal github only for those three files but it seems unecessary whereas there is already a git repo (although from aur git) with those. I'm looking for a better solution, but this is what I've got so far.

I wish they just shipped the icon together with the program, but no.

Perhaps we can extract the icon from the application itself. For example the one on the splash screen

I've tried looking around in the main jar file, however I can only find low quality

It could be it, how did u get it?

I sincerely don't, but I can take a look into it.

Here. It is embedded in the website, any idea of how to get it?

Okay, I looked a bit more and I found a file irpf.jar/IRPF-Licenses.txt the header of it reads

Termo Público de Cessão de Direito de Uso:
A Secretaria da Receita Federal do Brasil informa que o Programa
Aplicativo para Preenchimento da Declaração de Ajuste Anual do
Imposto de Renda de Pessoa Física do exercício de 2019, ano-calendário de 2018 (IRPF2019),
desenvolvido pelo SERPRO para a RFB, é objeto de propriedade intelectual da União
e tem seu uso licenciado para o contribuinte, para ser utilizado exclusivamente
para os fins a que se destina. Seu uso indiscriminado para finalidade
diversa sujeita o responsável às penas da lei.

.... I dont speak Portuguese ... but when I ran it through google translate, it was more or less the same except some clear contextual translation errors also.... the year is different.

If you prefer to use a hard-coded one, its cool and how you have it already works well.

Also, the idea is get everything from one source (as far as possible), so reading an excerpt from a website (which is bad enough) is a no go.

Im also questioning if the copyright file is needed as its embedded in their jar file also ... what purpose does it serve?

U are being of such help that I cannot thank you enough. This small text is the same thing. I just thought that including thing would be necessary as far as licensing goes, but I guess that specifying that it is unfree might be enough, maybe I should just remove it.

hqurve · 2022-03-09T15:59:38Z

pkgs/applications/finance/irpf/default.nix

+    mkdir -p $out/share/pixmaps
+    unzip -j lib/ppgd-icones-4.0.jar icones/rfb64.png -d $out/share/pixmaps
+
+    install -Dm644 ${desktopItem}/share/applications/irpf.desktop $out/share/applications/irpf.desktop


You can also use copyDesktopItems as used in https://github.com/NixOS/nixpkgs/blob/12d3b345c960458f62b77134b2ca1da5268277c9/pkgs/development/tools/mars-mips/default.nix

hqurve

I find its good but im not a committer :p

nixos-discourse · 2022-03-11T01:35:01Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/459

pkgs/applications/finance/irpf/default.nix

AndersonTorres · 2022-03-11T01:39:55Z

pkgs/applications/finance/irpf/default.nix

+  nativeBuildInputs = [ makeWrapper copyDesktopItems ];
+  buildInputs = [ unzip ];


Suggested change

nativeBuildInputs = [ makeWrapper copyDesktopItems ];

buildInputs = [ unzip ];

nativeBuildInputs = [ makeWrapper copyDesktopItems unzip ];

pkgs/applications/finance/irpf/default.nix

AndersonTorres · 2022-03-12T12:45:48Z

@AtilaSaraiva PING

AtilaSaraiva · 2022-03-13T00:25:05Z

Oh, sorry, gonna do.

AtilaSaraiva · 2022-03-13T00:32:58Z

Done, and also made a rebase to solve the conflict with the master branch.

hqurve · 2022-03-13T01:28:58Z

You forgot to move unzip to nativeBuildInputs

AtilaSaraiva · 2022-03-13T03:20:14Z

Oh, u're right, I managed to fix it rn.

AndersonTorres · 2022-03-14T13:07:22Z

Last modification: edit the commit message

Use irpf: init at 2022-1.0

Instead of irpf: init at 2022.1.0

AtilaSaraiva · 2022-03-14T14:11:44Z

Done, thx for the patience 🥇

github-actions · 2022-03-15T11:18:25Z

Backport failed for release-21.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-21.11
git worktree add -d .worktree/backport-163352-to-release-21.11 origin/release-21.11
cd .worktree/backport-163352-to-release-21.11
git checkout -b backport-163352-to-release-21.11
ancref=$(git merge-base aee602ac0ee907c7b7d0a15c815b29d098a0bbd7 899f1131d406ee4881b8e3962b14f06e2219cb87)
git cherry-pick -x $ancref..899f1131d406ee4881b8e3962b14f06e2219cb87

AtilaSaraiva force-pushed the irpf branch from 1cce61c to 1561dfb Compare March 8, 2022 16:59

AtilaSaraiva requested a review from AndersonTorres March 8, 2022 17:07

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Mar 8, 2022

hqurve reviewed Mar 8, 2022

View reviewed changes

AtilaSaraiva force-pushed the irpf branch from 1561dfb to 49c0580 Compare March 8, 2022 21:45

AtilaSaraiva requested review from hqurve, andresilva and andrestylianos March 8, 2022 21:46

hqurve reviewed Mar 8, 2022

View reviewed changes

AtilaSaraiva force-pushed the irpf branch from 49c0580 to cae4e5a Compare March 8, 2022 22:42

AtilaSaraiva closed this Mar 8, 2022

AtilaSaraiva reopened this Mar 8, 2022

AndersonTorres reviewed Mar 9, 2022

View reviewed changes

AtilaSaraiva force-pushed the irpf branch from cae4e5a to 430f54f Compare March 9, 2022 15:24

AtilaSaraiva requested review from AndersonTorres and hqurve March 9, 2022 15:24

AtilaSaraiva force-pushed the irpf branch 2 times, most recently from 422122e to 0fcb97a Compare March 9, 2022 15:42

hqurve reviewed Mar 9, 2022

View reviewed changes

AtilaSaraiva force-pushed the irpf branch 2 times, most recently from 0504403 to 6b3d10d Compare March 9, 2022 20:23

AtilaSaraiva requested a review from hqurve March 10, 2022 13:06

hqurve approved these changes Mar 10, 2022

View reviewed changes

AndersonTorres suggested changes Mar 11, 2022

View reviewed changes

pkgs/applications/finance/irpf/default.nix Outdated Show resolved Hide resolved

AtilaSaraiva force-pushed the irpf branch from 6b3d10d to fbeca8f Compare March 13, 2022 00:31

AtilaSaraiva force-pushed the irpf branch from fbeca8f to af7248a Compare March 13, 2022 03:19

AndersonTorres changed the title ~~irpf: init at 2022.1.0~~ irpf: init at 2022-1.0 Mar 13, 2022

irpf: init at 2022-1.0

899f113

AtilaSaraiva force-pushed the irpf branch from af7248a to 899f113 Compare March 14, 2022 14:10

AndersonTorres merged commit bb2820b into NixOS:master Mar 14, 2022

AtilaSaraiva deleted the irpf branch March 14, 2022 18:58

AtilaSaraiva added the backport release-21.11 label Mar 15, 2022

		src = fetchzip rec {
		url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${year}-1.0.zip";

	descriptions = "Programa Oficial da Receita para elaboração do IRPF";
	description = "Programa Oficial da Receita para elaboração do IRPF";

	--prefix _JAVA_AWT_WM_NONREPARENTING=1 AWT_TOOLKIT=MToolkit
	--set _JAVA_AWT_WM_NONREPARENTING 1 \
	--set AWT_TOOLKIT MToolkit


		install -Dm755 irpf.jar "$BASEDIR/${pname}.jar"
		install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR"

		BASEDIR="$out/share/${pname}"

		cp -r help lib lib-modulos "$BASEDIR"

		nativeBuildInputs = [ makeWrapper copyDesktopItems ];
		buildInputs = [ unzip ];

irpf: init at 2022-1.0 #163352

irpf: init at 2022-1.0 #163352

Conversation

AtilaSaraiva commented Mar 8, 2022

Description of changes

Things done

hqurve left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hqurve Mar 8, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hqurve Mar 8, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AtilaSaraiva commented Mar 8, 2022

AtilaSaraiva commented Mar 8, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hqurve left a comment

Choose a reason for hiding this comment

nixos-discourse commented Mar 11, 2022

Choose a reason for hiding this comment

AndersonTorres commented Mar 12, 2022

AtilaSaraiva commented Mar 13, 2022

AtilaSaraiva commented Mar 13, 2022

hqurve commented Mar 13, 2022

AtilaSaraiva commented Mar 13, 2022

AndersonTorres commented Mar 14, 2022

AtilaSaraiva commented Mar 14, 2022

github-actions bot commented Mar 15, 2022

hqurve Mar 8, 2022 •

edited

hqurve Mar 8, 2022 •

edited

AtilaSaraiva commented Mar 8, 2022 •

edited