Merge pull request #331507 from dotlambda/nextcloud

nc4nix: 0-unstable-2024-03-01 -> 0-unstable-2024-08-01

pkgs/build-support/fetchnextcloudapp/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, applyPatches, lib, ... }:
+{ fetchurl, fetchzip, applyPatches, lib, ... }:
 { url
 , hash ? ""
 , sha256 ? ""
@@ -8,19 +8,12 @@
 , patches ? [ ]
 , description ? null
 , homepage ? null
+, unpack ? true # whether to use fetchzip rather than fetchurl
 }:
 applyPatches ({
   inherit patches;
-  src = fetchzip {
+  src = (if unpack then fetchzip else fetchurl) {
     inherit url hash sha256;
-    postFetch = ''
-      pushd $out &>/dev/null
-      if [ ! -f ./appinfo/info.xml ]; then
-        echo "appinfo/info.xml doesn't exist in $out, aborting!"
-        exit 1
-      fi
-      popd &>/dev/null
-    '';
     meta = {
       license = lib.licenses.${license};
       longDescription = description;
@@ -31,6 +24,12 @@ applyPatches ({
       inherit homepage;
     };
   };
+  prePatch = ''
+    if [ ! -f ./appinfo/info.xml ]; then
+      echo "appinfo/info.xml doesn't exist in $out, aborting!"
+      exit 1
+    fi
+  '';
 } // lib.optionalAttrs (appName != null && appVersion != null) {
   name = "nextcloud-app-${appName}-${appVersion}";
 })

pkgs/by-name/nc/nc4nix/package.nix

@@ -1,28 +1,31 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  unstableGitUpdater,
 }:
 
 buildGoModule {
   pname = "nc4nix";
-  version = "0-unstable-2024-03-01";
+  version = "0-unstable-2024-08-01";
 
   src = fetchFromGitHub {
     owner = "helsinki-systems";
     repo = "nc4nix";
-    rev = "ba37674c0dddf93e0a011dace92ec7f0ec834765";
-    hash = "sha256-k12eeP2gojLCsJH1GGuiTmxz3ViPc0+oFBuptyh42Bw=";
+    rev = "827bb7244a3529e71c9474fe1f74aed51a4b08d5";
+    hash = "sha256-ToT+VvdXiUMmy0dNJAeyMlzMx87QhZPIwzxPXm2fR7s=";
   };
 
-  vendorHash = "sha256-ZXl4kMDY9ADkHUcLsl3uNpyErMzbgS+J65+uUeIXpSE=";
+  vendorHash = "sha256-qntRsv3KvAbV3lENjAHKkQOqh3uTo3gacfwase489tQ=";
 
-  meta = with lib; {
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
     description = "Packaging helper for Nextcloud apps";
     mainProgram = "nc4nix";
     homepage = "https://github.com/helsinki-systems/nc4nix";
-    license = licenses.mit;
-    maintainers = with maintainers; [ onny ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ onny ];
+    platforms = lib.platforms.linux;
   };
 }
-

pkgs/servers/nextcloud/notify_push.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "notify_push";
-  version = "0.6.12";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Wbrkr9DWOQpOKAp9X/PzU8alDDrDapX/1hE+ObbD/nc=";
+    hash = "sha256-QHVWiH6qkwQay0wffoyDUyVxgxzNp10ieYIsdqoEdCM=";
   };
 
-  cargoHash = "sha256-4bgbhtqdb1IVsf0yIcZOXZCVdRHjdvhZe/VCab0kuMk=";
+  cargoHash = "sha256-HwE/ql8rJcGIINy+hNnpaTFEJqbmuUDrIvVI8kCpfQ8=";
 
   passthru = rec {
     test_client = rustPlatform.buildRustPackage {
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
 
       buildAndTestSubdir = "test_client";
 
-      cargoHash = "sha256-Z7AX/PXfiUHEV/M+i/2qne70tcZnnPj/iNT+DNMECS8=";
+      cargoHash = "sha256-KybnPzCM9mLF55s5eZ3qr5GRcaaYFpEdNklWEo/72Ts=";
 
       meta = meta // {
         mainProgram = "test_client";

pkgs/servers/nextcloud/packages/default.nix

@@ -19,6 +19,7 @@ let packages = self:
         appName = pname;
         appVersion = data.version;
         license = appBaseDefs.${pname};
+        unpack = false;
         inherit (data) url hash description homepage;
       }) {};
 

pkgs/servers/nextcloud/packages/generate.sh

@@ -1,64 +1,14 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i bash -p jq gnused curl
+#! nix-shell -I nixpkgs=../../../.. -i bash -p nc4nix jq
 
 set -e
 set -u
 set -o pipefail
 set -x
 
-cd $(dirname -- "${BASH_SOURCE[0]}")
-
 export NEXTCLOUD_VERSIONS=$(nix-instantiate --eval -E 'import ./nc-versions.nix {}' -A e)
 
-APPS=$(jq -r 'keys|.[]' nextcloud-apps.json | sed -z 's/\n/,/g;s/,$/\n/')
-
-for v in ${NEXTCLOUD_VERSIONS//,/ }; do
-    # Get major version and back up previous major version apps file
-    v=$(sed -e 's/^"//' -e 's/"$//' <<<"$v")
-    MAJOR=${v%.*.*}
-    MAJOR_FILE="$MAJOR".json
-    mv "$MAJOR_FILE" "$MAJOR_FILE".bak
-
-    # Download current apps file from Nextcloud's official servers
-    APPS_PER_VERSION=${v}.json
-    curl "https://apps.nextcloud.com/api/v1/platform/${v}/apps.json" -o "$APPS_PER_VERSION"
-
-    # Add a starting bracket to the apps file for this version
-    echo '{' >"$MAJOR_FILE".tmp
-    for a in ${APPS//,/ }; do
-        echo "Fetching $a"
-        # Ensure the app exists in the file
-        if [ "$(jq -r ".[] | select(.id == \"${a}\")" "$APPS_PER_VERSION")" != "" ]; then
-            # Get all of our variables
-            VERSION=$(jq -r ".[] | select(.id == \"${a}\") | .releases[0].version" "$APPS_PER_VERSION")
-            URL=$(jq -r ".[] | select(.id == \"${a}\") | .releases[0].download" "$APPS_PER_VERSION")
-            HASH=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 --unpack "$URL" | jq -r .hash)
-            HOMEPAGE=$(jq -r ".[] | select(.id == \"${a}\") | .website" "$APPS_PER_VERSION")
-            DESCRIPTION=$(jq ".[] | select(.id == \"${a}\") | .translations.en.description" "$APPS_PER_VERSION")
-            # Add all variables to the file
-            cat >>"$MAJOR_FILE".tmp <<EOF
-"${a}": {
-"hash": "$HASH",
-"url": "$URL",
-"version": "$VERSION",
-"description": $DESCRIPTION,
-"homepage": "$HOMEPAGE"
-},
-EOF
+APPS=`cat nextcloud-apps.json | jq -r 'keys|.[]' | sed -z 's/\n/,/g;s/,$/\n/'`
 
-        # If we can't find the app, then don't try to process it.
-        else
-            true
-        fi
-    done
-    # clean up by removing last trailing comma
-    sed -i '$s/,$//' "$MAJOR_FILE".tmp
-    # Add final closing bracket
-    echo '}' >>"$MAJOR_FILE".tmp
-    # Beautify file
-    jq '.' "$MAJOR_FILE".tmp >"$MAJOR_FILE"
-    # Remove the temporary files
-    rm "$APPS_PER_VERSION"
-    rm "$MAJOR_FILE".tmp
-    rm "$MAJOR_FILE".bak
-done
+nc4nix -apps $APPS
+rm *.log