Unverified Commit 24869f05 authored by Janik's avatar Janik Committed by GitHub
Browse files

Merge pull request #274212 from justanotherariel/master 

morgen: 3.0.1 -> 3.1.6
parents d66de5ac f6813efd

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -9308,6 +9308,12 @@ 
    githubId = 5124422;

    name = "Julien Urraca";

  };

  justanotherariel = {

    email = "ariel@ebersberger.io";

    github = "justanotherariel";

    githubId = 31776703;

    name = "Ariel Ebersberger";

  };

  justinas = {

    email = "justinas@justinas.org";

    github = "justinas";

pkgs/applications/office/morgen/default.nix

+7 −4
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 


stdenv.mkDerivation rec {

  pname = "morgen";

  version = "3.0.1";

  version = "3.1.6";



  src = fetchurl {

    url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";

    sha256 = "sha256-lj+V5mntZzED2ZS62Uwlt/vTXwSuwzXeuEw8y/bA6og=";

    url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";

    hash = "sha256-/rMPNIpjkHdLE0lAdWCz71DbcqIW+1Y6RdFrYAfTSKU=";

  };



  nativeBuildInputs = [
@@ -46,12 +46,15 @@ stdenv.mkDerivation rec { 
    runHook postInstall

  '';



  passthru.updateScript = ./update.sh;



  meta = with lib; {

    description = "All-in-one Calendars, Tasks and Scheduler";

    homepage = "https://morgen.so/download";

    mainProgram = "morgen";

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    license = licenses.unfree;

    maintainers = with maintainers; [ wolfangaukang ];

    maintainers = with maintainers; [ justanotherariel wolfangaukang ];

    platforms = [ "x86_64-linux" ];

  };

}

pkgs/applications/office/morgen/update.sh

0 → 100755
+26 −0
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -i bash -p curl jq common-updater-scripts



set -euo pipefail



# URL to check for the latest version

latestUrl="https://dl.todesktop.com/210203cqcj00tw1/linux/deb/x64"



# Fetch the latest version information

latestInfo=$(curl -sI -X GET $latestUrl | grep -oP 'morgen-\K\d+(\.\d+)*(?=[^\d])')



if [[ -z "$latestInfo" ]]; then

    echo "Could not find the latest version number."

    exit 1

fi



# Extract the version number

latestVersion=$(echo "$latestInfo" | head -n 1)



echo "Latest version of Morgen is $latestVersion"



# Update the package definition

update-source-version morgen "$latestVersion"



# Fetch and update the hash

nix-prefetch-url --unpack "https://dl.todesktop.com/210203cqcj00tw1/versions/${latestVersion}/linux/deb"

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -10970,7 +10970,7 @@ with pkgs; 
  mole = callPackage ../tools/networking/mole { };















  morgen = callPackage ../applications/office/morgen {













    electron = electron_25; # blank screen with electron_26













    electron = electron_28;















  };





























  mosh = callPackage ../tools/networking/mosh { };