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

Commits on Oct 28, 2019

  1. shotgun: init at 2.2.0

    lumi authored and Jon committed Oct 28, 2019
    Copy the full SHA
    ac2d736 View commit details
Showing with 35 additions and 0 deletions.
  1. +5 −0 maintainers/maintainer-list.nix
  2. +28 −0 pkgs/tools/graphics/shotgun/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -3911,6 +3911,11 @@
githubId = 13791;
name = "Luke Gorrie";
};
lumi = {
email = "lumi@pew.im";
github = "lumi-me-not";
name = "lumi";
};
luz = {
email = "luz666@daum.net";
github = "Luz";
28 changes: 28 additions & 0 deletions pkgs/tools/graphics/shotgun/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libXrandr, libX11 }:

rustPlatform.buildRustPackage rec {
pname = "shotgun";
version = "2.2.0";

nativeBuildInputs = [ pkg-config ];

buildInputs = [ libXrandr libX11 ];

src = fetchFromGitHub {
owner = "neXromancers";
repo = pname;
rev = "v${version}";
sha256 = "tJnF1X+NI1hP0J/n3rGy8TD/yIveqRPVlJvJvn0C7Do=";
};

cargoSha256 = "TL2WehcCwygLMVVrBHOX1HgVtDhgVsIgUeiadEjCj1o=";

meta = with lib; {
description = "Minimal X screenshot utility";
homepage = "https://github.com/neXromancers/shotgun";
license = with licenses; [ mpl20 ];
maintainers = with maintainers; [ lumi ];
platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -20714,6 +20714,8 @@ in

shfmt = callPackage ../tools/text/shfmt { };

shotgun = callPackage ../tools/graphics/shotgun {};

shutter = callPackage ../applications/graphics/shutter { };

simple-scan = gnome3.simple-scan;