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

gitea: 1.8.2 -> 1.8.3 #63413

Merged
merged 2 commits into from Jun 19, 2019
Merged

gitea: 1.8.2 -> 1.8.3 #63413

merged 2 commits into from Jun 19, 2019

Conversation

etu
Copy link
Contributor

@etu etu commented Jun 18, 2019

Motivation for this change

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.8.3

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@etu
Copy link
Contributor Author

etu commented Jun 18, 2019

@GrahamcOfBorg test gitea

@etu etu mentioned this pull request Jun 18, 2019
10 tasks
@etu
Copy link
Contributor Author

etu commented Jun 18, 2019

@GrahamcOfBorg build nixosTests.gitea

@etu
Copy link
Contributor Author

etu commented Jun 18, 2019

cc @aanderse

@aanderse
Copy link
Member

@etu hmm... cp: cannot create regular file '/var/lib/gitea/custom/conf/app.ini': No such file or directory definitely seems like it could be a tmpfiles issue 🤔

@GrahamcOfBorg test jackett

@aanderse
Copy link
Member

@etu this fixes it:

~/nixpkgs> git diff
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 7daa2dd0d4c..d1807a90619 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -307,6 +307,7 @@ in
     systemd.tmpfiles.rules = [
       "d '${cfg.stateDir}' - ${cfg.user} gitea - -"
       "d '${cfg.stateDir}/conf' - ${cfg.user} gitea - -"
+      "d '${cfg.stateDir}/custom' - ${cfg.user} gitea - -"
       "d '${cfg.stateDir}/custom/conf' - ${cfg.user} gitea - -"
       "d '${cfg.repositoryRoot}' - ${cfg.user} gitea - -"
       "Z '${cfg.stateDir}' - ${cfg.user} gitea - -"

If I had to take a wild guess... the systemd-tmpfiles application has changed ever so slightly between the version of systemd in 19.03 and master and this is causing the difference?

@flokli or @andir might know off the top of their head... but I'm not going to dig through changelogs at this point.

@etu
Copy link
Contributor Author

etu commented Jun 19, 2019

@aanderse Thanks for looking into it, I've added that rule now. Guessing that commit won't need backporting :)

@GrahamcOfBorg test gitea

@etu
Copy link
Contributor Author

etu commented Jun 19, 2019

@GrahamcOfBorg build nixosTests.gitea

@etu
Copy link
Contributor Author

etu commented Jun 19, 2019

@aanderse The tests seems fine now :)

@aanderse aanderse merged commit 93412bc into NixOS:master Jun 19, 2019
@etu etu deleted the gitea-183-update branch June 19, 2019 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants