Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ssb-patchwork: 3.17.2 -> 3.17.4 #80446

Merged
merged 2 commits into from Feb 21, 2020
Merged

ssb-patchwork: 3.17.2 -> 3.17.4 #80446

merged 2 commits into from Feb 21, 2020

Conversation

asymmetric
Copy link
Contributor

@asymmetric asymmetric commented Feb 18, 2020 •
edited

Motivation for this change

Version bump.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from picnoir and flokli February 18, 2020 15:58
picnoir
picnoir approved these changes Feb 18, 2020
View reviewed changes
Copy link
Member

@picnoir picnoir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Built and tested. Works like a charm.

Thanks!

Maybe you could add yourself to the maintainers list since you beat me for the last two updates? :P

@flokli
Copy link
Contributor

flokli commented Feb 18, 2020

Also, please drop my maintainership - Unfortunately, I'm not using this currently.

@asymmetric
Copy link
Contributor Author

@NinjaTrappeur @flokli done!

@ofborg ofborg bot requested a review from picnoir February 18, 2020 20:29
@utdemir
Copy link
Member

utdemir commented Feb 21, 2020

Meanwhile, 3.17.4 is released, including an important bugfix (https://github.com/ssbc/patchwork/commits/6c5bd2f9a7915cbee10af48d10708afdfcb29749). Might be easier to update this PR.

@picnoir
Copy link
Member

picnoir commented Feb 21, 2020 •
edited

Not a nixpkgs comitter: I can't update this branch. However, the 3.17.4 update does fix the issue (which I did not stumbled upon yet) for me.

Here's the patch:

From 182ada4a0e48d24922f21b03b1347c09f2b9691a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Fri, 21 Feb 2020 08:53:53 +0100
Subject: [PATCH] ssb-patchwork: 3.17.4 -> 3.17.4

---
 pkgs/applications/networking/ssb/patchwork/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
index 9086e329d97..a332ac665c0 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ssb-patchwork";
-  version = "3.17.3";
+  version = "3.17.4";
   name = "Patchwork-${version}";
 
   src = fetchurl {
     url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage";
-    sha256 = "03jvsf7rf7njhhl1ypdix31kdwaxbmmg3v6kkk7xljb2ha27q457";
+    sha256 = "0mjyrd0d9wfsfd9ajg1xf7ijg4k8jp76swjsiydxpgfk1sdljswv";
   };
 
   binary = appimageTools.wrapType2 {
-- 
2.23.1

Thanks for the heads up @utdemir !

@asymmetric
Copy link
Contributor Author

Applied patch and tested bugfix, looking good.

@asymmetric asymmetric changed the title ssb-patchwork: 3.17.2 -> 3.17.3 ssb-patchwork: 3.17.2 -> 3.17.4 Feb 21, 2020
asymmetric
asymmetric commented Feb 21, 2020
View reviewed changes
pkgs/applications/networking/ssb/patchwork/default.nix
@@ -23,7 +23,7 @@ let
name = "ssb-patchwork";
exec = "${binary}/bin/ssb-patchwork";
icon = "ssb-patchwork.png";
comment = "Decentralized messaging and sharing app";
comment = "Client for the decentralized social network Secure Scuttlebutt";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed this so that Patchwork can be found more easily via e.g. rofi by typing "scuttlebutt" (requires customizing rofi).

I'm also open to changing makeDesktopItem to accept a keywords argument instead.

@picnoir
Copy link
Member

picnoir commented Feb 21, 2020 via email

@grahamc grahamc merged commit 4d66792 into NixOS:master Feb 21, 2020
@asymmetric asymmetric deleted the patchwork-3.17.3 branch February 21, 2020 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli Awaiting requested review from flokli

@picnoir picnoir Awaiting requested review from picnoir

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@asymmetric @flokli @utdemir @picnoir @grahamc