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: 8fa2565a73c5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c898a91af0a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 15, 2018

  1. selfoss (service): fix port in service config (#50411) 

    (cherry picked from commit 8bf4fe8)
    @rafaelgg
    rafaelgg committed Nov 15, 2018
    Copy the full SHA
    17293a8 View commit details

  2. Merge pull request #50436 from rafaelgg/fix-selfoss-port-backport 

    selfoss (service): fix port in service config (backport of #50411)
    @Mic92
    Mic92 authored Nov 15, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8c898a9 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/services/web-apps/selfoss.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/web-apps/selfoss.nix
View file
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ let
db_database=${cfg.database.name}
db_username=${cfg.database.user}
db_password=${cfg.database.password}
db_port=${if (cfg.database.port != null) then cfg.database.port
else default_port}
db_port=${toString (if (cfg.database.port != null) then cfg.database.port
else default_port)}
''
}
${cfg.extraConfig}