summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorNinjatrappeur <NinjaTrappeur@users.noreply.github.com>2020-11-14 18:34:51 +0100
committerGitHub <noreply@github.com>2020-11-14 18:34:51 +0100
commit07202f86d9b608ac77d03d3cbf562454bdfaa569 (patch)
tree12e1f9be89234267fa2c14cd622913f32999e1e0 /pkgs/tools/misc
parente3cf6e12bc39401e26b4e45ed121e71c828d8d3a (diff)
parent9ebf4409d2302d859f0dfa1c52ec23f0f4730078 (diff)
Merge pull request #103716 from raboof/pastebinit-fix-basic-usage
pastebinit: fix basic usage
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/pastebinit/default.nix29
1 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix
index a3134f57397c9..9b4202504a0f1 100644
--- a/pkgs/tools/misc/pastebinit/default.nix
+++ b/pkgs/tools/misc/pastebinit/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, python3 }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, python3
+}:
 
 stdenv.mkDerivation rec {
   version = "1.5";
@@ -9,7 +13,26 @@ stdenv.mkDerivation rec {
     sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2";
   };
 
-  buildInputs = [ python3 ];
+  buildInputs = [
+    (python3.withPackages (p: [ p.distro ]))
+  ];
+
+  patchFlags = [ "-p0" ];
+
+  patches = [
+    # Required to allow pastebinit 1.5 to run on Python 3.8
+    (fetchpatch {
+      name = "use-distro-module.patch";
+      url = "https://bazaar.launchpad.net/~arnouten/pastebinit/python38/diff/264?context=3";
+      sha256 = "1gp5inp4xald65xbb7fc5aqq5s2fhw464niwjjja9anqyp3zhawj";
+    })
+    # Required because pastebin.com now redirects http requests to https
+    (fetchpatch {
+      name = "pastebin-com-https.patch";
+      url = "https://bazaar.launchpad.net/~arnouten/pastebinit/pastebin-com-https/diff/264?context=3";
+      sha256 = "0hxhhfcai0mll8qfyhdl3slmbf34ynb759b648x63274m9nd2kji";
+    })
+  ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -22,7 +45,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://launchpad.net/pastebinit";
     description = "A software that lets you send anything you want directly to a pastebin from the command line";
-    maintainers = with maintainers; [ lethalman ];
+    maintainers = with maintainers; [ lethalman raboof ];
     license = licenses.gpl2;
     platforms = platforms.linux;
   };