Unverified Commit b467e92d authored by Toma's avatar Toma Committed by GitHub
Browse files

siyuan: 3.1.13 -> 3.1.16; improve updateScript (#362889)

parents 7dd2a130 9d6d8ec7

pkgs/by-name/si/siyuan/package.nix

+14 −6
Original line number Diff line number Diff line
@@ -35,20 +35,20 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "siyuan";

  version = "3.1.13";

  version = "3.1.16";



  src = fetchFromGitHub {

    owner = "siyuan-note";

    repo = "siyuan";

    rev = "v${finalAttrs.version}";

    hash = "sha256-+jlJTsGvElumUV1NdYed0XthmY1MFNqWMgDmTQObIA4=";

    hash = "sha256-8+Gz9AuxmK2hOApRZ2b1+rROOG94EBJR3pyp8YwtgiA=";

  };



  kernel = buildGo123Module {

    name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";

    inherit (finalAttrs) src;

    sourceRoot = "${finalAttrs.src.name}/kernel";

    vendorHash = "sha256-uK++FoWCoeb05TyUhh0PK+wkTmzTko0K7oLodoGAWt8=";

    vendorHash = "sha256-B2pGXs0IN5WhNHoFgTufd46q60RNvWzNdwoCxpayYC8=";



    patches = [

      (replaceVars ./set-pandoc-path.patch {
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { 
      src

      sourceRoot

      ;

    hash = "sha256-uv3gahbSW81gHMx0sQoUbW4Oyzvo6iD5u1izX8vXkwA=";

    hash = "sha256-LlQdfRGsBn3IZWKSUqH5tAljXnWanuFXO2x+Wi3on7E=";

  };



  sourceRoot = "${finalAttrs.src.name}/app";
@@ -141,7 +141,12 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru = {

    inherit (finalAttrs.kernel) goModules; # this tricks nix-update into also updating the kernel goModules FOD

    updateScript = nix-update-script { };

    updateScript = nix-update-script {

      extraArgs = [

        "--version-regex"

        "^v(\\d+\\.\\d+\\.\\d+)$"

      ];

    };

  };



  meta = {
@@ -149,7 +154,10 @@ stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://b3log.org/siyuan/";

    license = lib.licenses.agpl3Plus;

    mainProgram = "siyuan";

    maintainers = with lib.maintainers; [ tomasajt ];

    maintainers = with lib.maintainers; [

      tomasajt

      ltrump

    ];

    platforms = lib.attrNames platformIds;

  };

})