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

Commits on Nov 4, 2018

  1. motion: 4.1.1 -> 4.2

    @peterhoeg
    peterhoeg committed Nov 4, 2018
    Copy the full SHA
    cdd4d8b View commit details

Commits on Nov 14, 2018

  1. Merge pull request #50339 from peterhoeg/u/motion 

    motion: 4.1.1 -> 4.2
    @Mic92
    Mic92 authored Nov 14, 2018
    Copy the full SHA
    081f17f View commit details
Showing with 11 additions and 9 deletions.
  1. +11 −9 pkgs/applications/video/motion/default.nix
20 changes: 11 additions & 9 deletions pkgs/applications/video/motion/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libjpeg, ffmpeg }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, ffmpeg, libjpeg, libmicrohttpd }:

stdenv.mkDerivation rec {
name = "motion-${version}";
version = "4.1.1";
version = "4.2";

src = fetchFromGitHub {
owner = "Motion-Project";
repo = "motion";
rev = "release-${version}";
sha256 = "1prbgl9wb9q7igsb6n11c25m0p0z246fxr1q8n1vcjr4rcb65y38";
owner = "Motion-Project";
repo = "motion";
rev = "release-${version}";
sha256 = "0c0q6dl4v561m5y8bp0c0h4p3s52fjgcdnsrrf5ygdi288d3rfxv";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libjpeg ffmpeg ];

buildInputs = [ ffmpeg libjpeg libmicrohttpd ];

meta = with stdenv.lib; {
homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome;
description = "Monitors the video signal from cameras";
homepage = https://motion-project.github.io/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.puffnfresh ];
maintainers = with maintainers; [ puffnfresh ];
};
}