Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ihatemoney: init at 4.1 plus module and test #68973

Merged
merged 5 commits into from Jan 9, 2020
Merged

Conversation

@symphorien
Copy link
Contributor

symphorien commented Sep 17, 2019

Motivation for this change

missing package

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @Ekleog

};
meta = {
homepage = "https://ihatemoney.org";
description = "A simple shared budget manager web application";

This comment has been minimized.

Copy link
@FRidh

FRidh Sep 17, 2019

Member

web application so it probably does not belong in python-packages.nix

This comment has been minimized.

Copy link
@symphorien

symphorien Sep 17, 2019

Author Contributor

I tried to use buildPythonApplication but using the wsgi.py needs to use this package as a python module and not a python application. Hence the placement in python-packages.nix.

group = "ihatemoney";
db = "ihatemoney";
python3 = config.services.uwsgi.package.python3;
pkg = python3.pkgs.ihatemoney;

This comment has been minimized.

Copy link
@FRidh

FRidh Sep 17, 2019

Member

here the package is selected

module = "wsgi:application";
chdir = "${pkg}/${pkg.pythonModule.sitePackages}/ihatemoney";
env = [ "IHATEMONEY_SETTINGS_FILE_PATH=${configFile}" ];
pythonPackages = self: [ self.ihatemoney ];

This comment has been minimized.

Copy link
@FRidh

FRidh Sep 17, 2019

Member

and here as well?

This comment has been minimized.

Copy link
@symphorien

symphorien Sep 17, 2019

Author Contributor

Yes but I know it is the same package because I use the python which was used to build uwsgi. This is precisely the reason to introduce the services.uwsgi.package internal option.

@Ekleog
Copy link
Member

Ekleog commented Sep 20, 2019

@FRidh The answers from @symphorien seem reasonable enough to me, do you think this needs more work or does this look good to you?

@symphorien
Copy link
Contributor Author

symphorien commented Oct 20, 2019

Any more comments?

@@ -0,0 +1,61 @@
{ python3Packages, lib, fetchFromGitHub, nixosTests }:

This comment has been minimized.

Copy link
@FRidh

FRidh Oct 22, 2019

Member

Do not pass in python3Packages because it will be called for every python version. Instead, every dep needs to be a parameter of its own.

This comment has been minimized.

Copy link
@symphorien

symphorien Nov 1, 2019

Author Contributor

fixed

@symphorien symphorien force-pushed the symphorien:ihatemoney branch from 698f5bf to 6554860 Nov 1, 2019
@symphorien symphorien requested a review from jonringer as a code owner Nov 1, 2019
Copy link
Contributor

aanderse left a comment

All nix code should be consistently indented with two spaces per level of indentation.

After these relatively trivial cosmetic nitpicks have been resolved I see no reason not to merge if @FRidh is satisfied.

@symphorien symphorien force-pushed the symphorien:ihatemoney branch 2 times, most recently from 09b3e67 to 32d2266 Nov 2, 2019
@symphorien
Copy link
Contributor Author

symphorien commented Nov 2, 2019

I reindented the files.

@symphorien
Copy link
Contributor Author

symphorien commented Jan 3, 2020

Any interest in merging ?

@Ekleog
Ekleog approved these changes Jan 5, 2020
http = ":8000";
};
};
boot.cleanTmpDir = true;

This comment has been minimized.

Copy link
@Ekleog

Ekleog Jan 5, 2020

Member

Wanted to go ahead and merge, but there's just this remaining place with wrong indentation -- the below are just nits seen while re-reading through :)

nixos/tests/ihatemoney.nix Outdated Show resolved Hide resolved
nixos/tests/ihatemoney.nix Outdated Show resolved Hide resolved
symphorien and others added 3 commits Jan 5, 2020
Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
now indentation is perfect
@symphorien
Copy link
Contributor Author

symphorien commented Jan 5, 2020

ran nixpkgs-fmt on nixos/tests/ihatemoney.nix.

@Ekleog
Copy link
Member

Ekleog commented Jan 9, 2020

@ofborg build nixosTests.ihatemoney

@Ekleog
Copy link
Member

Ekleog commented Jan 9, 2020

Thanks! Resolved the remaining conflicts, this LGTM, let's merge :)

@Ekleog Ekleog merged commit 8fcf992 into NixOS:master Jan 9, 2020
16 checks passed
16 checks passed
nixosTests.ihatemoney on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
nixosTests.ihatemoney on aarch64-linux Success
Details
nixosTests.ihatemoney on x86_64-linux Success
Details
@symphorien symphorien deleted the symphorien:ihatemoney branch Mar 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.