From 1bae4c84ee430f046d55453cb4c84486bade05fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 May 2024 18:22:55 +0000 Subject: [PATCH 1/7] morgen: 3.4.2 -> 3.4.3 (cherry picked from commit ceb8e1aaaeecd9f7722ad08d97f74c3c12d8ee90) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 5f6c9ea5c119..4bd45374ece2 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-N9G9yfUhKZd3dcsyBKODL6vnMqQgLk2DRQ+YZAYdPks="; + hash = "sha256-QxbvD18yoIidiDoU7FsCpdgYZolp8LRx93d1GTjtnfA="; }; nativeBuildInputs = [ From 4cefad5a46f18256953b885dfa982c559e36fc69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 19:34:14 +0000 Subject: [PATCH 2/7] morgen: 3.4.3 -> 3.4.4 (cherry picked from commit 62942da8548170c1d78e1799558a1e3ccb1f2672) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 4bd45374ece2..d14fd28d9db1 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-QxbvD18yoIidiDoU7FsCpdgYZolp8LRx93d1GTjtnfA="; + hash = "sha256-l4wHCapIvD3kZk1DqLNWDLjwg6j7g0+qMB/KuMzH+pQ="; }; nativeBuildInputs = [ From ed32d0ab100308107975288533eb42c818a1bbe3 Mon Sep 17 00:00:00 2001 From: Ariel Ebersberger Date: Wed, 12 Jun 2024 13:20:08 +0200 Subject: [PATCH 3/7] morgen: electron_28 -> electron_29 (cherry picked from commit 286beb5f80e10bfc4e2acf81c1a5596236b0b635) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f54fce79166d..67abe98a43af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10663,7 +10663,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_28; + electron = electron_29; }; mosh = callPackage ../tools/networking/mosh { }; From f99b0ce108efc10e47dc729237b4e3247371dd79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 09:10:34 +0000 Subject: [PATCH 4/7] morgen: 3.4.4 -> 3.4.5 (cherry picked from commit 40eb861d785391ea8a26988c78cbe078b8dc1bda) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index d14fd28d9db1..7bae5b5388d7 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-l4wHCapIvD3kZk1DqLNWDLjwg6j7g0+qMB/KuMzH+pQ="; + hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; }; nativeBuildInputs = [ From 04113f1cde36c2ee1218b688eb920ddc28713bb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jun 2024 03:59:55 +0000 Subject: [PATCH 5/7] morgen: 3.4.5 -> 3.5.1 (cherry picked from commit 47c6c7b15e654c5894df5203d6b92ccd7fb606cb) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 7bae5b5388d7..56ab32c3439c 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.5"; + version = "3.5.1"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; + hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs="; }; nativeBuildInputs = [ From 1620cf62264da436a4d527662b1f209004031f2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Aug 2024 09:43:51 +0000 Subject: [PATCH 6/7] morgen: 3.5.1 -> 3.5.5 (cherry picked from commit 48a9a6a9b3de23f3025d0489dc8adba24bd33460) --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 56ab32c3439c..522a43881180 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.5.1"; + version = "3.5.5"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs="; + hash = "sha256-xT/mV54L2tXiQnUR7K/h61FsHtF16siEExM/I0mSy+8="; }; nativeBuildInputs = [ From fdd1865a4853bcc5f713bb0fe9c34ac5a682e386 Mon Sep 17 00:00:00 2001 From: justanotherariel Date: Tue, 20 Aug 2024 10:52:29 +0200 Subject: [PATCH 7/7] morgen: electron_29 -> electron_30 (cherry picked from commit 4a463f1c60d9e37f34b93a02b713a948c3d833b2) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67abe98a43af..01ad5173c63e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10663,7 +10663,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_29; + electron = electron_30; }; mosh = callPackage ../tools/networking/mosh { };