public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
(a trivial conflict in transmission)
This commit is contained in:
Vladimír Čunát
2021-05-09 09:31:27 +02:00
parent 9f024e4c92 90c2fb1f2f
commit 5663b2b2d3
201 changed files with 2565 additions and 1560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/graphics/gmic/default.nix
View File

@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gmic";
version = "2.9.6";
version = "2.9.7";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
sha256 = "sha256-0i/oUVrxbc0FDQmgvHEn7Cn0eVznMqDGw+r4OTVrwRo=";
sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY=";
};
nativeBuildInputs = [

4
pkgs/tools/graphics/timg/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "timg";
version = "1.4.0";
version = "1.4.2";
src = fetchFromGitHub {
owner = "hzeller";
repo = "timg";
rev = "v${version}";
sha256 = "10qhjfkbazncmj07y0a6cpmi7ki0l10qzpvi2zh8369yycqqxr8y";
sha256 = "1zjcaxnik8imkn22g5kz6zly3yxpknrzd093sfxpgqnfw4sq8149";
};
buildInputs = [ graphicsmagick ffmpeg libexif libjpeg zlib ];