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

Commits on Jun 7, 2017

  1. slop: 4.1.16 -> 6.3.41

    @primeos
    primeos committed Jun 7, 2017
    Copy the full SHA
    02aa326 View commit details

  2. maim: 3.4.47 -> 5.4.63

    @primeos
    primeos committed Jun 7, 2017
    Copy the full SHA
    a745009 View commit details
Showing with 27 additions and 16 deletions.
  1. +15 −8 pkgs/tools/graphics/maim/default.nix
  2. +12 −8 pkgs/tools/misc/slop/default.nix
23 changes: 15 additions & 8 deletions pkgs/tools/graphics/maim/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
{ stdenv, fetchurl, cmake, gengetopt, imlib2, libXrandr, libXfixes }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, zlib, libpng, libjpeg
, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop }:

stdenv.mkDerivation rec {
name = "maim-${version}";
version = "3.4.47";
version = "5.4.63";

src = fetchurl {
url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz";
sha256 = "0kfp7k55bxc5h6h0wv8bwmsc5ny66h9ra2z4dzs4yzszq16544pv";
src = fetchFromGitHub {
owner = "naelstrof";
repo = "maim";
rev = "v${version}";
sha256 = "16jl62hzrq1kciqwr9s3bxgcf9yz42kiwc5abkay1yd0vfcx200i";
};

buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs =
[ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr
libXcomposite slop ];

doCheck = false;

meta = with stdenv.lib; {
homepage = https://github.com/naelstrof/maim;
inherit (src.meta) homepage;
description = "A command-line screenshot utility";
longDescription = ''
maim (make image) takes screenshots of your desktop. It has options to
@@ -23,6 +30,6 @@ stdenv.mkDerivation rec {
'';
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with maintainers; [ mbakke ];
maintainers = with maintainers; [ primeos mbakke ];
};
}
20 changes: 12 additions & 8 deletions pkgs/tools/misc/slop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
{ stdenv, fetchurl, cmake, gengetopt, libX11, libXext, cppcheck}:
{ stdenv, fetchFromGitHub, cmake
, glm, mesa, gengetopt, libX11, libXext, libXrender, cppcheck}:

stdenv.mkDerivation rec {
name = "slop-${version}";
version = "4.1.16";
version = "6.3.41";

src = fetchurl {
url = "https://github.com/naelstrof/slop/archive/v${version}.tar.gz";
sha256 = "0679ax0jr97x91hmp9qrspdka8cvl3xa77z92k4qgicbnb6hr7y2";
src = fetchFromGitHub {
owner = "naelstrof";
repo = "slop";
rev = "v${version}";
sha256 = "051w2hcpz4qmvy7bmnzv7llxr2jbcpfxdadlzr2cidr323cann27";
};

buildInputs = [ cmake gengetopt libX11 libXext ]
nativeBuildInputs = [ cmake ];
buildInputs = [ glm mesa gengetopt libX11 libXext libXrender ]
++ stdenv.lib.optional doCheck cppcheck;

doCheck = false;

meta = with stdenv.lib; {
homepage = https://github.com/naelstrof/slop;
inherit (src.meta) homepage;
description = "Queries a selection from the user and prints to stdout";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with maintainers; [ mbakke ];
maintainers = with maintainers; [ primeos mbakke ];
};
}