Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 183c956c01e1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 71f4eeb291c6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 1, 2018

  1. gitea: fix undefined variable 'gitea'.

    Commit 42c35de, which is a cherry-pick
    of 28c20a4 uses the variable 'gitea',
    which is not defined in the 18.03 module.
    
    Fix this by: gitea -> pkgs.gitea
    danieldk committed Aug 1, 2018
    Copy the full SHA
    717e9e4 View commit details
  2. Merge pull request #44293 from danieldk/gitea-fix

    gitea: fix undefined variable 'gitea'.
    Mic92 authored Aug 1, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    71f4eeb View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/misc/gitea.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/gitea.nix
Original file line number Diff line number Diff line change
@@ -266,7 +266,7 @@ in
# update command option in authorized_keys
if [ -r ${cfg.stateDir}/.ssh/authorized_keys ]
then
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys
fi
'' + optionalString (usePostgresql && cfg.database.createDatabase) ''
if ! test -e "${cfg.stateDir}/db-created"; then