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: 4b7401bb5b32
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f4c70939166
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 5, 2020

  1. mautrix-whatsapp: 0.1.3 -> 0.1.4 

    https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.4
    @Ma27
    Ma27 committed Sep 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    86a1a0a View commit details

  2. gitea: 1.12.3 -> 1.12.4 

    ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.12.4

This release fixes a few security bugs:

* https://github.com/go-gitea/gitea/issues?q=label%3Abackport%2Fv1.12+label%3Akind%2Fsecurity+is%3Aclosed
    @Ma27
    Ma27 committed Sep 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2f4c709 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitea/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ with stdenv.lib;

buildGoPackage rec {
pname = "gitea";
version = "1.12.3";
version = "1.12.4";

src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "05z1pp2lnbr82pw97wy0j0qk2vv1qv9c46df13d03xdfsc3gsm50";
sha256 = "0zz3mwf1yhncvi6pl52lcwbl7k4kkrqyw8q3476akwszjn79n83c";
};

unpackPhase = ''
14 changes: 7 additions & 7 deletions pkgs/applications/version-management/gitea/static-root-path.patch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 714015c47..a2f85337e 100644
index 45e55a2..9d18ee4 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -641,7 +641,7 @@ func NewContext() {
PortToRedirect = sec.Key("PORT_TO_REDIRECT").MustString("80")
@@ -667,7 +667,7 @@ func NewContext() {
OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath)
+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
if len(StaticRootPath) == 0 {
- StaticRootPath = AppWorkPath
+ StaticRootPath = "@data@"
}
StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(StaticRootPath)
StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour)
AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data"))
EnableGzip = sec.Key("ENABLE_GZIP").MustBool()
6 changes: 3 additions & 3 deletions pkgs/servers/mautrix-whatsapp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.1.3";
version = "0.1.4";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "v${version}";
sha256 = "1qagp6jnc4n368pg4h3jr9bzpwpbnva1xyl1b1k2a7q4b5fm5yww";
sha256 = "1c77f3ffm6m9j8q9p1hb9i8zrqqpvfkr9ffamly44gs7xddmv9sv";
};

buildInputs = [ olm ];

vendorSha256 = "1dmlqhhwmc0k9nbab5j8sl20b8d6b5yrmcdf7ibaiqh7i16zrp3s";
vendorSha256 = "01yr5321paqifmgzz235lknsa0w4hbs3182y6pxw8hqsvh18c48b";

doCheck = false;