git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #163499 from Izorkin/update-peertube

peertube: 4.1.0 -> 4.1.1

commit575ab73913f9c140126dcb018327bff061f4ad6d authorStig <stig@stig.io> dateSat 19 Mar 2022, 15:08 (5 years ago) parent6c36085a822d0c
2 files changed+12−4
compare with master
unifiedsplit
nixos/tests/web-apps/peertube.nix+3 pkgs/servers/peertube/default.nix+9−4
nixos/tests/web-apps/peertube.nix+3
@@ -120,6 +120,9 @@ import ../make-test-python.nix ({pkgs, ...}:
120120 # Check if PeerTube is running
121121 client.succeed("curl --fail http://peertube.local:9000/api/v1/config/about | jq -r '.instance.name' | grep 'PeerTube\ Test\ Server'")
122122
123+ # Check PeerTube CLI version
124+ assert "${pkgs.peertube.version}" in server.succeed('su - peertube -s /bin/sh -c "peertube --version"')
125+
123126 client.shutdown()
124127 server.shutdown()
125128 database.shutdown()
pkgs/servers/peertube/default.nix+9−4
@@ -6,13 +6,13 @@ let
66 if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64"
77 else throw "Unsupported architecture: ${stdenv.hostPlatform.system}";
88
9− version = "4.1.0";
9+ version = "4.1.1";
1010
1111 source = fetchFromGitHub {
1212 owner = "Chocobozzz";
1313 repo = "PeerTube";
1414 rev = "v${version}";
15− sha256 = "sha256-gW/dzWns6wK3zzNjbW19HrV2jqzjdXR5uMMNXL4Xfdw=";
15+ sha256 = "sha256-yBRontvkcVU3BNUIB6WfH2a5blU9u3CNyHrou16h42s=";
1616 };
1717
1818 yarnOfflineCacheServer = fetchYarnDeps {
@@ -27,7 +27,7 @@ let
2727
2828 yarnOfflineCacheClient = fetchYarnDeps {
2929 yarnLock = "${source}/client/yarn.lock";
30− sha256 = "sha256-wniMvtz7i3I4pn9xyzfNi1k7gQuzDl1GmEO8LqPBMKg=";
30+ sha256 = "sha256-cBa0lNq9JsYi34EJzl0pPbDXSYL9a8g6MmiL6Ge65ms=";
3131 };
3232
3333 bcrypt_version = "5.0.1";
@@ -75,10 +75,15 @@ in stdenv.mkDerivation rec {
7575 cd ~
7676
7777 # Build PeerTube server
78− npm run build:server
78+ npm run tsc -- --build ./tsconfig.json
79+ npm run resolve-tspaths:server
80+ cp -r "./server/static" "./server/assets" "./dist/server"
81+ cp -r "./server/lib/emails" "./dist/server/lib"
7982
8083 # Build PeerTube tools
84+ cp -r "./server/tools/node_modules" "./dist/server/tools"
8185 npm run tsc -- --build ./server/tools/tsconfig.json
86+ npm run resolve-tspaths:cli
8287
8388 # Build PeerTube client
8489 npm run build:client