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: 1e7bac94014a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0ad6a98d8879
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 9, 2019

  1. pb_cli: 1.0 -> 2019-03-10

    @ar1a
    ar1a committed Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alexandre-abrioux Alexandre ABRIOUX
    GPG key ID: 5C4778F91CA5BB29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    57bfa0c View commit details

  2. Merge pull request #57167 from ar1a/pbclibroken 

    pb_cli: 1.0 -> 2019-03-10
    @ryantm
    ryantm authored Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alexandre-abrioux Alexandre ABRIOUX
    GPG key ID: 5C4778F91CA5BB29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0ad6a98 View commit details
Showing with 6 additions and 17 deletions.
  1. +0 −10 pkgs/tools/misc/pb_cli/0001-eval-fix.patch
  2. +6 −7 pkgs/tools/misc/pb_cli/default.nix
10 changes: 0 additions & 10 deletions pkgs/tools/misc/pb_cli/0001-eval-fix.patch
View file

This file was deleted.

13 changes: 6 additions & 7 deletions pkgs/tools/misc/pb_cli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,18 +6,16 @@ assert video -> capture != null;
assert clipboard -> xclip != null;

stdenv.mkDerivation rec {
name = "pb_cli-${version}";
version = "1.0";
name = "pb_cli-unstable-${version}";
version = "2019-03-10";

src = fetchFromGitHub {
owner = "ptpb";
repo = "pb_cli";
rev = "5242382b3d6b5c0ddaf6e4843a69746b40866e57";
sha256 = "0543x3377apinhxnsfq82zlp5sm8g1bf6hmsvvcwra5rsshv2ybk";
rev = "6b9ce1ee45fe651d06d7c479a20026a173dd328b";
sha256 = "0w6a789zffvz4ixsb92q45n5s4xyx7s2l2f07972i3dajaaai8z7";
};

patches = [ ./0001-eval-fix.patch ];

buildInputs = [ makeWrapper ];

liveDeps = [ jq curl ] ++ stdenv.lib.optional screenshots maim
@@ -33,8 +31,9 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
description = "A no bullshit ptpb client";
description = "A no bullshit 0x0.st client";
homepage = "https://github.com/ptpb/pb_cli";
maintainers = [ maintainers.ar1a ];
license = licenses.gpl3Plus;
};
}