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

Commits on Mar 9, 2019

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

    @ar1a
    ar1a committed Mar 9, 2019
    Copy the full SHA
    4263152 View commit details

  2. Merge pull request #57166 from ar1a/capture-license 

    capture: 1.0 -> 2019-03-10
    @ryantm
    ryantm authored Mar 9, 2019
    Copy the full SHA
    5511fd1 View commit details
Showing with 5 additions and 38 deletions.
  1. +0 −10 pkgs/tools/misc/capture/0001-eval-fix.patch
  2. +0 −22 pkgs/tools/misc/capture/0002-sane-defaults.patch
  3. +5 −6 pkgs/tools/misc/capture/default.nix
10 changes: 0 additions & 10 deletions pkgs/tools/misc/capture/0001-eval-fix.patch
View file

This file was deleted.

22 changes: 0 additions & 22 deletions pkgs/tools/misc/capture/0002-sane-defaults.patch
View file

This file was deleted.

11 changes: 5 additions & 6 deletions pkgs/tools/misc/capture/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
{ stdenv, pkgs, slop, ffmpeg, fetchFromGitHub, makeWrapper}:

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

src = fetchFromGitHub {
owner = "buhman";
repo = "capture";
rev = "4be986f17462b8d520559429c74da6bf3a436259";
sha256 = "172y06vs993x5v78zwl81xma1gkvjq1ad9rvmf3a217fyxsz4nhh";
rev = "80dd9e7195aad5c132badef610f19509f3935b24";
sha256 = "0zyyg4mvrny7cc2xgvfip97b6yc75ka5ni39rwls93971jbk83d6";
};

buildInputs = [ makeWrapper ];

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

installPhase = ''
install -Dm755 src/capture.sh $out/bin/capture
@@ -27,5 +25,6 @@ stdenv.mkDerivation rec {
description = "A no bullshit screen capture tool";
homepage = "https://github.com/buhman/capture";
maintainers = [ maintainers.ar1a ];
license = licenses.gpl3Plus;
};
}