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

Commits on Jun 7, 2019

  1. grim: 1.1 -> 1.2.0

    @dtzWill
    dtzWill committed Jun 7, 2019
    Copy the full SHA
    6768742 View commit details

Commits on Jun 9, 2019

  1. Merge pull request #62796 from dtzWill/update/grim-1.2.0 

    grim: 1.1 -> 1.2.0
    @etu
    etu authored Jun 9, 2019
    Copy the full SHA
    560504f View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/tools/graphics/grim/default.nix
8 changes: 4 additions & 4 deletions pkgs/tools/graphics/grim/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, wayland-protocols }:

stdenv.mkDerivation rec {
name = "grim-${version}";
version = "1.1";
pname = "grim";
version = "1.2.0";

src = fetchFromGitHub {
owner = "emersion";
repo = "grim";
repo = pname;
rev = "v${version}";
sha256 = "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz";
sha256 = "0brljl4zfbn5mh9hkfrfkvd27c5y9vdkgap9r1hrfy9r1x20sskn";
};

nativeBuildInputs = [