Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2ba2292a04c7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 373d71d2261f
Choose a head ref
  • 10 commits
  • 4 files changed
  • 3 contributors

Commits on Jul 16, 2020

  1. motion: 4.3.0 -> 4.3.1

    @veprbl
    veprbl committed Jul 16, 2020
    Copy the full SHA
    7dd1a19 View commit details

  2. motion: switch ffmpeg_3 to ffmpeg

    @veprbl
    veprbl committed Jul 16, 2020
    Copy the full SHA
    f84294c View commit details

  3. motion: add meta.platforms

    @veprbl
    veprbl committed Jul 16, 2020
    Copy the full SHA
    a598665 View commit details

Commits on Jul 21, 2020

  1. kbs2: 0.1.2 -> 0.1.3

    @marsam
    marsam committed Jul 21, 2020
    Copy the full SHA
    124e079 View commit details

  2. pdfminer: 20200517 -> 20200720

    @marsam
    marsam committed Jul 21, 2020
    Copy the full SHA
    cdc2c75 View commit details

  3. spacebar: 1.1.0 -> 1.1.1

    @cmacrae
    cmacrae committed Jul 21, 2020
    Copy the full SHA
    fcdb62d View commit details

  4. Merge pull request #93218 from veprbl/pr/motion_4_3_1 

    motion: 4.3.0 -> 4.3.1
    @veprbl
    veprbl authored Jul 21, 2020
    Copy the full SHA
    45c61c8 View commit details

Commits on Jul 22, 2020

  1. Merge pull request #93573 from marsam/update-kbs2 

    kbs2: 0.1.2 -> 0.1.3
    @marsam
    marsam authored Jul 22, 2020
    Copy the full SHA
    4a7bb7d View commit details

  2. Merge pull request #93574 from marsam/update-pdfminer 

    pdfminer: 20200517 -> 20200720
    @marsam
    marsam authored Jul 22, 2020
    Copy the full SHA
    f3f6449 View commit details

  3. Merge pull request #93606 from cmacrae/upgrade/spacebar/v1.1.1 

    spacebar: 1.1.0 -> 1.1.1
    @marsam
    marsam authored Jul 22, 2020
    Copy the full SHA
    373d71d View commit details
11 changes: 6 additions & 5 deletions pkgs/applications/video/motion/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, ffmpeg_3, libjpeg, libmicrohttpd }:
, ffmpeg, libjpeg, libmicrohttpd }:

stdenv.mkDerivation rec {
pname = "motion";
version = "4.3.0";
version = "4.3.1";

src = fetchFromGitHub {
owner = "Motion-Project";
repo = "motion";
rev = "Release-${version}";
sha256 = "08mm7ajgs0qnrydywxxyzcll09z80crjnjkjnckdi6ljsj6s96j8";
rev = "release-${version}";
sha256 = "01yy4pdgd4wa97bpw27zn5zik9iz719m1jiwkk9lb7m2a2951dhc";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];

buildInputs = [ ffmpeg_3 libjpeg libmicrohttpd ];
buildInputs = [ ffmpeg libjpeg libmicrohttpd ];

meta = with stdenv.lib; {
description = "Monitors the video signal from cameras";
homepage = "https://motion-project.github.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ puffnfresh veprbl ];
platforms = platforms.unix;
};
}
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/pdfminer_six/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers }:
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }:

buildPythonPackage rec {
pname = "pdfminer_six";
version = "20200517";
version = "20200720";

disabled = !isPy3k;

@@ -11,10 +11,10 @@ buildPythonPackage rec {
owner = "pdfminer";
repo = "pdfminer.six";
rev = version;
sha256 = "00272pxkh6djm37yvlvgd06w7ycf35srwk6n3p58ppw5hgmpkhc2";
sha256 = "19cnl1b6mrk9i18a1k4vdl5k85ww8yhfq89w3fxh6rb0fla5d71i";
};

propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ];
propagatedBuildInputs = [ chardet cryptography sortedcontainers ];

checkInputs = [ nose ];
checkPhase = ''
4 changes: 2 additions & 2 deletions pkgs/os-specific/darwin/spacebar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "spacebar";
version = "1.1.0";
version = "1.1.1";

src = fetchFromGitHub {
owner = "cmacrae";
repo = pname;
rev = "v${version}";
sha256 = "0w0mkf4kb21aicb85zbp3m6nvk6m5306mchbd5nm988kgirmxnl4";
sha256 = "1x0wzm380nv81j26jqqg4y4dwanydnpdsca41ndw6xyj9zlv73f7";
};

buildInputs = [ Carbon Cocoa ScriptingBridge ];
6 changes: 3 additions & 3 deletions pkgs/tools/security/kbs2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "kbs2";
version = "0.1.2";
version = "0.1.3";

src = fetchFromGitHub {
owner = "woodruffw";
repo = pname;
rev = "v${version}";
sha256 = "1zsqc57dvdn6v0xxb0vf78f50p08km983qhlsf79sr73ch0r3nji";
sha256 = "1zp4gpbqhivmp7lpm10xb6ahx1z7nsijz7pi5i0bndv0y9mr609p";
};

cargoSha256 = "0hz99s5i60r8c1jgpb7j7z42j8ad4zzi94z2c0aiddq916z0xcsf";
cargoSha256 = "1inqz4whqw9mb3m22kv44f255m3cjr66pc5ncdw2rgpy3zjh4p3z";

nativeBuildInputs = [ installShellFiles ]
++ stdenv.lib.optionals stdenv.isLinux [ python3 ];