Unverified Commit b663d72f authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #331507 from dotlambda/nextcloud 

nc4nix: 0-unstable-2024-03-01 -> 0-unstable-2024-08-01
parents 34bfa1c8 5c812046

pkgs/build-support/fetchnextcloudapp/default.nix

+9 −10
Original line number Diff line number Diff line 
{ 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

+15 −12
Original line number Diff line number Diff line 
{ 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

+4 −4
Original line number Diff line number Diff line
@@ -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/28.json

+190 −98

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/servers/nextcloud/packages/29.json

+190 −98

File changed.

Preview size limit exceeded, changes collapsed.