~andir/nixpkgs-dev

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
7 3

[PATCH v3 1/2] gmni: init at 2021-03-26

Details
Message ID
<20210326195603.29471-1-ben@bsima.me>
DKIM signature
pass
Download raw message
Patch: +23 -0
---
 .../networking/browsers/gmni/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/gmni/default.nix

diff --git a/pkgs/applications/networking/browsers/gmni/default.nix b/pkgs/applications/networking/browsers/gmni/default.nix
new file mode 100644
index 00000000000..a1a76d92941
--- /dev/null
+++ b/pkgs/applications/networking/browsers/gmni/default.nix
@@ -0,0 +1,21 @@
{stdenv, lib, fetchFromSourcehut, pkg-config, bearssl, scdoc}:

stdenv.mkDerivation rec {
  name = "gmni";
  version = "2021-03-26";
  src = fetchFromSourcehut {
    owner = "~sircmpwn";
    repo = "gmni";
    rev = "77b73efbcd3ea7ed9e3e4c0aa19d9247e21d3c87";
    sha256 = "1wvnzyv7vyddcd39y6q5aflpnnsdl4k4y5aj5ssb7vgkld0h1b7r";
  };
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ bearssl scdoc ];
  meta = with lib; {
    description = "A Gemini client";
    homepage = "https://git.sr.ht/~sircmpwn/gmni";
    license = licenses.gpl3;
    maintainers = with maintainers; [ bsima ];
    platforms = platforms.all;
  };
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c23ffb81235..e8265a71776 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1366,6 +1366,8 @@ in

  glasgow = with python3Packages; toPythonApplication glasgow;

  gmni = callPackage ../applications/networking/browsers/gmni { };

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

  gojsontoyaml = callPackage ../development/tools/gojsontoyaml { };
-- 
2.28.0

[PATCH v3 2/2] gmnisrv: init at 2021-03-26

Details
Message ID
<20210326195603.29471-2-ben@bsima.me>
In-Reply-To
<20210326195603.29471-1-ben@bsima.me> (view parent)
DKIM signature
pass
Download raw message
Patch: +24 -0
---
 pkgs/servers/gemini/gmnisrv/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/gemini/gmnisrv/default.nix

diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix
new file mode 100644
index 00000000000..1fb63eda6e2
--- /dev/null
+++ b/pkgs/servers/gemini/gmnisrv/default.nix
@@ -0,0 +1,22 @@
{stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mailcap, scdoc}:

stdenv.mkDerivation rec {
  name = "gmnvisrv";
  version = "2021-03-26";
  src = fetchFromSourcehut {
    owner = "~sircmpwn";
    repo = "gmnisrv";
    rev = "f23ec10a6d66c574bbf718c4b10f2cf91ea8daef";
    sha256 = "1n0iiz6gd3dmv1r7i6437zmrv0vim69fc0haqfvagd4y20hy5s8z";
  };
  MIMEDB = "${mailcap}/etc/mime.types";
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl mailcap scdoc ];
  meta = with lib; {
    description = "A simple Gemini protocol server";
    homepage = "https://git.sr.ht/~sircmpwn/gmnisrv";
    license = licenses.gpl3;
    maintainers = with maintainers; [ bsima ];
    platforms = platforms.all;
  };
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8265a71776..ab700090c99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1368,6 +1368,8 @@ in

  gmni = callPackage ../applications/networking/browsers/gmni { };

  gmnisrv = callPackage ../servers/gemini/gmnisrv { };

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

  gojsontoyaml = callPackage ../development/tools/gojsontoyaml { };
-- 
2.28.0
Details
Message ID
<20210329184545.wcaafvh5sndslfk3@monad>
In-Reply-To
<20210326195603.29471-1-ben@bsima.me> (view parent)
DKIM signature
missing
Download raw message
awesome, beat me to it!

Reviewed-by: William Casarin <jb55@jb55.com>

Re: [PATCH v3 2/2] gmnisrv: init at 2021-03-26

Details
Message ID
<20210329184730.r3a4kl4fmfjr7zam@monad>
In-Reply-To
<20210326195603.29471-2-ben@bsima.me> (view parent)
DKIM signature
missing
Download raw message
great! just need a module now :)

Reviewed-by: William Casarin <jb55@jb55.com>

Re: [PATCH v3 2/2] gmnisrv: init at 2021-03-26

Details
Message ID
<20210330124038.qmv7fnzdgv7ubnxc@monad>
In-Reply-To
<20210326195603.29471-2-ben@bsima.me> (view parent)
DKIM signature
missing
Download raw message
pr'd at: https://github.com/NixOS/nixpkgs/pull/118056 

This gave me the opportunity to test out the github cli which I used to
PR this. Saved me from having to use the web interface. yay!

There is some feedback already if you want to send a v4.

Cheers,
Will

Re: [PATCH v3 2/2] gmnisrv: init at 2021-03-26

Details
Message ID
<87v998im0x.fsf@yoctocell.xyz>
In-Reply-To
<20210330124038.qmv7fnzdgv7ubnxc@monad> (view parent)
DKIM signature
pass
Download raw message
On Tue, Mar 30 2021, William Casarin wrote:

> pr'd at: https://github.com/NixOS/nixpkgs/pull/118056 
>
> This gave me the opportunity to test out the github cli which I used to
> PR this. Saved me from having to use the web interface. yay!
>

Thank you for taking care of this!  I still haven't figured out a quick
way to send patches as PRs...

Re: [PATCH v3 2/2] gmnisrv: init at 2021-03-26

Details
Message ID
<20210330174358.xpeayvf7dbbrshdn@monad>
In-Reply-To
<87v998im0x.fsf@yoctocell.xyz> (view parent)
DKIM signature
missing
Download raw message
Hey Xinglu,

On Tue, Mar 30, 2021 at 07:33:50PM +0200, Xinglu Chen wrote:
>On Tue, Mar 30 2021, William Casarin wrote:
>
>> pr'd at: https://github.com/NixOS/nixpkgs/pull/118056
>>
>> This gave me the opportunity to test out the github cli which I used to
>> PR this. Saved me from having to use the web interface. yay!
>>
>
>Thank you for taking care of this!  I still haven't figured out a quick
>way to send patches as PRs...

My current steps are:

1. Get the threadid from notmuch

     $ notmuch search --output=summary --format=json to:nixpkgs-dev and subject:PATCH |
     jq -rcC '.[] | [.date_relative,.subject,.authors,.thread] | @tsv' |
     fzf -m |
     cut -d $'\t' -f4 |
     sed 's,^,thread:,g'

2. Create and apply patches

     $ git checkout -b new-pr
     
     $ notmuch am <thread-id>
     
     $ git am ./output.mbx

3. Create PR via cli tools

     * install `gh`
     * gh auth login
     * gh pr create

Then I was able to create the PR interactively. It pushed the branch to
my fork and created the PR. Was relatively straightforward.

I was then able to update the patchset by repeating these steps and then
force pushing the branch.

Cheers,
Will

Re: [PATCH v3 2/2] gmnisrv: init at 2021-03-26

Details
Message ID
<87o8f0ikew.fsf@yoctocell.xyz>
In-Reply-To
<20210330174358.xpeayvf7dbbrshdn@monad> (view parent)
DKIM signature
pass
Download raw message
Hi William,

On Tue, Mar 30 2021, William Casarin wrote:

>>Thank you for taking care of this!  I still haven't figured out a quick
>>way to send patches as PRs...
>
> My current steps are:
>
> 1. Get the threadid from notmuch
>
>      $ notmuch search --output=summary --format=json to:nixpkgs-dev and subject:PATCH |
>      jq -rcC '.[] | [.date_relative,.subject,.authors,.thread] | @tsv' |
>      fzf -m |
>      cut -d $'\t' -f4 |
>      sed 's,^,thread:,g'
>
> 2. Create and apply patches
>
>      $ git checkout -b new-pr
>      
>      $ notmuch am <thread-id>
>      
>      $ git am ./output.mbx
>
> 3. Create PR via cli tools
>
>      * install `gh`
>      * gh auth login
>      * gh pr create
>
> Then I was able to create the PR interactively. It pushed the branch to
> my fork and created the PR. Was relatively straightforward.
>
> I was then able to update the patchset by repeating these steps and then
> force pushing the branch.

Cool, thanks for sharing this!
Reply to thread Export thread (mbox)