diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-22 06:01:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-22 06:01:21 +0000 |
| commit | 77f501b5dfc19386d9e0cfb0d26b8bb18ed3ee17 (patch) | |
| tree | 8c36b941771aa835eb4a0886744e294d08c6e449 /pkgs/servers | |
| parent | 3cd1b92b069a64963f0458fd7787e0fe8a7757a9 (diff) | |
| parent | 25105c40d125d4f6f3ba0a41aeda0b0b52b1caed (diff) | |
| download | nixpkgs-77f501b5dfc19386d9e0cfb0d26b8bb18ed3ee17.tar nixpkgs-77f501b5dfc19386d9e0cfb0d26b8bb18ed3ee17.tar.gz nixpkgs-77f501b5dfc19386d9e0cfb0d26b8bb18ed3ee17.tar.bz2 nixpkgs-77f501b5dfc19386d9e0cfb0d26b8bb18ed3ee17.tar.lz nixpkgs-77f501b5dfc19386d9e0cfb0d26b8bb18ed3ee17.tar.xz nixpkgs-77f501b5dfc19386d9e0cfb0d26b8bb18ed3ee17.tar.zst nixpkgs-77f501b5dfc19386d9e0cfb0d26b8bb18ed3ee17.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/jackett/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/radarr/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/outline/default.nix | 11 |
3 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index bb4a946edb1..d33a18ac98b 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -41,6 +41,7 @@ buildDotnetModule rec { meta = with lib; { description = "API Support for your favorite torrent trackers"; homepage = "https://github.com/Jackett/Jackett/"; + changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; }; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 99a52827b0f..aef97256c1a 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -47,6 +47,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A Usenet/BitTorrent movie downloader"; homepage = "https://radarr.video/"; + changelog = "https://github.com/Radarr/Radarr/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ edwtjo purcell ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 35df24afd46..c438c791869 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -56,15 +56,16 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin $out/share/outline - mv node_modules build $out/share/outline/ + mv public node_modules build $out/share/outline/ + + node_modules=$out/share/outline/node_modules + build=$out/share/outline/build + # On NixOS the WorkingDirectory is set to the build directory, as # this contains files needed in the onboarding process. This folder # must also contain the `public` folder for mail notifications to # work, as it contains the mail templates. - mv public $out/share/outline/build - - node_modules=$out/share/outline/node_modules - build=$out/share/outline/build + ln -s $out/share/outline/public $build/public makeWrapper ${nodejs}/bin/node $out/bin/outline-server \ --add-flags $build/server/index.js \ |