From fb325604861e1598ede0d73f4f5fcbc721ae98ad Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Sun, 14 Jul 2019 16:58:49 -0700
Subject: [PATCH 1/2] Add Pamplemousse to the maintainers list

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7b8a7701d004..81ec29ff27db 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4772,6 +4772,12 @@
     githubId = 11016164;
     name = "Fedor Pakhomov";
   };
+  pamplemousse = {
+    email = "xav.maso@gmail.com";
+    github = "Pamplemousse";
+    githubId = 2647236;
+    name = "Xavier Maso";
+  };
   panaeon = {
     email = "vitalii.voloshyn@gmail.com";
     github = "panaeon";

From 77783268da5dbc55023c4f263696da680997eca7 Mon Sep 17 00:00:00 2001
From: Pamplemousse <xav.maso@gmail.com>
Date: Sat, 7 Sep 2019 12:25:02 -0700
Subject: [PATCH 2/2] rappel: init at unstable-2019-07-08

---
 pkgs/development/misc/rappel/default.nix | 38 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/misc/rappel/default.nix

diff --git a/pkgs/development/misc/rappel/default.nix b/pkgs/development/misc/rappel/default.nix
new file mode 100644
index 000000000000..02c31fd4d690
--- /dev/null
+++ b/pkgs/development/misc/rappel/default.nix
@@ -0,0 +1,38 @@
+{ fetchFromGitHub
+, libedit
+, makeWrapper
+, nasm
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rappel";
+  version = "unstable-2019-07-08";
+
+  src = fetchFromGitHub {
+    owner = "yrp604";
+    repo = "rappel";
+    rev = "95a776f850cf6a7c21923a2100b605408ef038de";
+    sha256 = "0fmd15xa6hswh3x48av4g1sf6rncbiinbj7gbw1ffvqsbcfnsgcr";
+  };
+
+  buildInputs = [ libedit ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 -t $out/bin bin/rappel
+    wrapProgram $out/bin/rappel --prefix PATH : "${nasm}/bin"
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/yrp604/rappel";
+    description = "A pretty janky assembly REPL";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.pamplemousse ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eccf4850ffe9..8ca32468ff77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9109,6 +9109,8 @@ in
 
   mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { };
 
+  rappel = callPackage ../development/misc/rappel/default.nix { };
+
   pharo-vms = callPackage ../development/pharo/vm { };
   pharo = pharo-vms.multi-vm-wrapper;
   pharo-cog32 = pharo-vms.cog32;