summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorStig <stig@stig.io>2022-03-19 15:08:25 +0100
committerGitHub <noreply@github.com>2022-03-19 15:08:25 +0100
commit575ab73913f9c140126dcb018327bff061f4ad6d (patch)
tree7aaadf05b4a16c7e120ffb316daf435f0f7505bb /pkgs/servers
parent6c3608592e50c13d56a82112bfb244cad3d82dec (diff)
parenta822d0c0756c085cb18b889bfcd39838e14b6fa1 (diff)
downloadnixpkgs-575ab73913f9c140126dcb018327bff061f4ad6d.tar
nixpkgs-575ab73913f9c140126dcb018327bff061f4ad6d.tar.gz
nixpkgs-575ab73913f9c140126dcb018327bff061f4ad6d.tar.bz2
nixpkgs-575ab73913f9c140126dcb018327bff061f4ad6d.tar.lz
nixpkgs-575ab73913f9c140126dcb018327bff061f4ad6d.tar.xz
nixpkgs-575ab73913f9c140126dcb018327bff061f4ad6d.tar.zst
nixpkgs-575ab73913f9c140126dcb018327bff061f4ad6d.zip
Merge pull request #163499 from Izorkin/update-peertube
peertube: 4.1.0 -> 4.1.1
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/peertube/default.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix
index 9961e9d581a..558c21c6cd1 100644
--- a/pkgs/servers/peertube/default.nix
+++ b/pkgs/servers/peertube/default.nix
@@ -6,13 +6,13 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64"
     else throw "Unsupported architecture: ${stdenv.hostPlatform.system}";
 
-  version = "4.1.0";
+  version = "4.1.1";
 
   source = fetchFromGitHub {
     owner = "Chocobozzz";
     repo = "PeerTube";
     rev = "v${version}";
-    sha256 = "sha256-gW/dzWns6wK3zzNjbW19HrV2jqzjdXR5uMMNXL4Xfdw=";
+    sha256 = "sha256-yBRontvkcVU3BNUIB6WfH2a5blU9u3CNyHrou16h42s=";
   };
 
   yarnOfflineCacheServer = fetchYarnDeps {
@@ -27,7 +27,7 @@ let
 
   yarnOfflineCacheClient = fetchYarnDeps {
     yarnLock = "${source}/client/yarn.lock";
-    sha256 = "sha256-wniMvtz7i3I4pn9xyzfNi1k7gQuzDl1GmEO8LqPBMKg=";
+    sha256 = "sha256-cBa0lNq9JsYi34EJzl0pPbDXSYL9a8g6MmiL6Ge65ms=";
   };
 
   bcrypt_version = "5.0.1";
@@ -75,10 +75,15 @@ in stdenv.mkDerivation rec {
     cd ~
 
     # Build PeerTube server
-    npm run build:server
+    npm run tsc -- --build ./tsconfig.json
+    npm run resolve-tspaths:server
+    cp -r "./server/static" "./server/assets" "./dist/server"
+    cp -r "./server/lib/emails" "./dist/server/lib"
 
     # Build PeerTube tools
+    cp -r "./server/tools/node_modules" "./dist/server/tools"
     npm run tsc -- --build ./server/tools/tsconfig.json
+    npm run resolve-tspaths:cli
 
     # Build PeerTube client
     npm run build:client