Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e3cf6e12bc39
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07202f86d9b6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 13, 2020

  1. pastebinit: fix basic usage

    @raboof
    raboof committed Nov 13, 2020
    Copy the full SHA
    9ebf440 View commit details

Commits on Nov 14, 2020

  1. Merge pull request #103716 from raboof/pastebinit-fix-basic-usage 

    pastebinit: fix basic usage
    Ninjatrappeur authored Nov 14, 2020
    Copy the full SHA
    07202f8 View commit details
Showing with 26 additions and 3 deletions.
  1. +26 −3 pkgs/tools/misc/pastebinit/default.nix
29 changes: 26 additions & 3 deletions pkgs/tools/misc/pastebinit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};