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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-18 08:57:16 -07:00
parent c227fb4b17 d189df235a
commit f7a112f6c4
264 changed files with 3781 additions and 1606 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/asterisk/sccp/default.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, binutils-unwrapped, patchelf, asterisk }:
stdenv.mkDerivation rec {
pname = "asterisk-module-sccp";
version = "4.3.2-epsilon";
version = "4.3.4";
src = fetchFromGitHub {
owner = "chan-sccp";
repo = "chan-sccp";
rev = "v${version}";
sha256 = "0sp74xvb35m32flsrib0983yn1dyz3qk69vp0gqbx620ycbz19gd";
sha256 = "sha256-YGHK4A03Ba/tnVTnu9VuhIy/xQ5C/7ZX8h9mxqKsnZI=";
};
nativeBuildInputs = [ patchelf ];
pkgs/servers/blockbook/default.nix
+3
View File
@@ -65,5 +65,8 @@ buildGoModule rec {
license = licenses.agpl3;
maintainers = with maintainers; [ mmahut _1000101 ];
platforms = platforms.unix;
# go dependency tecbot/gorocksdb requires rocksdb 5.x but nixpkgs has only rocksdb 6.x
# issue in upstream can be tracked here: https://github.com/trezor/blockbook/issues/617
broken = true;
};
}
pkgs/servers/dns/dnsdist/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "dnsdist";
version = "1.5.1";
version = "1.5.2";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
sha256 = "1wgv19b6y4fp5x1z54psaaialji2rckl5vdh156kyw47k9r5krya";
sha256 = "sha256-K9e1M9Lae7RWY8amLkftDS8Zigd/WNxzDEY7eXNjZ0k=";
};
nativeBuildInputs = [ pkg-config protobuf ];
pkgs/servers/home-assistant/component-packages.nix
+7 -7
View File
@@ -109,7 +109,7 @@
"caldav" = ps: with ps; [ caldav ];
"calendar" = ps: with ps; [ aiohttp-cors ];
"camera" = ps: with ps; [ aiohttp-cors ];
"canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary
"canary" = ps: with ps; [ ha-ffmpeg py-canary ];
"cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pyroute2 zeroconf ];
"cert_expiry" = ps: with ps; [ ];
"channels" = ps: with ps; [ pychannels ];
@@ -157,7 +157,7 @@
"decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
"default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow pyroute2 scapy sqlalchemy zeroconf ];
"delijn" = ps: with ps; [ ]; # missing inputs: pydelijn
"delijn" = ps: with ps; [ pydelijn ];
"deluge" = ps: with ps; [ deluge-client ];
"demo" = ps: with ps; [ aiohttp-cors ];
"denon" = ps: with ps; [ ];
@@ -407,7 +407,7 @@
"ipp" = ps: with ps; [ pyipp ];
"iqvia" = ps: with ps; [ numpy pyiqvia ];
"irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail
"islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator
"islamic_prayer_times" = ps: with ps; [ prayer-times-calculator ];
"iss" = ps: with ps; [ ]; # missing inputs: pyiss
"isy994" = ps: with ps; [ ]; # missing inputs: pyisy
"itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir
@@ -582,7 +582,7 @@
"nx584" = ps: with ps; [ pynx584 ];
"nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi
"oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics
"obihai" = ps: with ps; [ ]; # missing inputs: pyobihai
"obihai" = ps: with ps; [ pyobihai ];
"octoprint" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ];
"oem" = ps: with ps; [ ]; # missing inputs: oemthermostat
"ohmconnect" = ps: with ps; [ defusedxml ];
@@ -614,7 +614,7 @@
"orvibo" = ps: with ps; [ orvibo ];
"osramlightify" = ps: with ps; [ ]; # missing inputs: lightify
"otp" = ps: with ps; [ pyotp ];
"ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy
"ovo_energy" = ps: with ps; [ ovoenergy ];
"owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ];
"ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ];
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
@@ -626,7 +626,7 @@
"pencom" = ps: with ps; [ ]; # missing inputs: pencompy
"persistent_notification" = ps: with ps; [ ];
"person" = ps: with ps; [ aiohttp-cors pillow ];
"philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs
"philips_js" = ps: with ps; [ ha-philipsjs ];
"pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx
"pi_hole" = ps: with ps; [ hole ];
"picnic" = ps: with ps; [ python-picnic-api ];
@@ -972,7 +972,7 @@
"yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ];
"yamaha" = ps: with ps; [ rxv ];
"yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast
"yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps
"yandex_transport" = ps: with ps; [ aioymaps ];
"yandextts" = ps: with ps; [ ];
"yeelight" = ps: with ps; [ yeelight ];
"yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower
pkgs/servers/home-assistant/default.nix
+5
View File
@@ -214,6 +214,7 @@ in with py.pkgs; buildPythonApplication rec {
"caldav"
"calendar"
"camera"
"canary"
"cast"
"climacell"
"climate"
@@ -286,6 +287,7 @@ in with py.pkgs; buildPythonApplication rec {
"intent"
"intent_script"
"ipp"
"islamic_prayer_times"
"jewish_calendar"
"kmtronic"
"knx"
@@ -328,11 +330,13 @@ in with py.pkgs; buildPythonApplication rec {
"ondilo_ico"
"openerz"
"opentherm_gw"
"ovo_energy"
"ozw"
"panel_custom"
"panel_iframe"
"persistent_notification"
"person"
"philips_js"
"plaato"
"plugwise"
"prometheus"
@@ -407,6 +411,7 @@ in with py.pkgs; buildPythonApplication rec {
"workday"
"worldclock"
"xiaomi_miio"
"yandex_transport"
"yeelight"
"zeroconf"
"zha"
pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, rustPlatform, fetchFromGitHub, lib, Security, nixosTests }:
{ stdenv, rustPlatform, fetchFromGitHub, lib, libiconv, Security, nixosTests }:
rustPlatform.buildRustPackage rec {
pname = "wireguard-exporter";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE=";
buildInputs = lib.optional stdenv.isDarwin Security;
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; };
pkgs/servers/reproxy/default.nix
+36
View File
@@ -0,0 +1,36 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "reproxy";
version = "0.5.1";
src = fetchFromGitHub {
owner = "umputun";
repo = pname;
rev = "v${version}";
hash = "sha256-RB3+IU6halnk/2REh2CLDpQN7djn4Y1QuL8y8xppnQw=";
};
postPatch = ''
# Requires network access
substituteInPlace app/main_test.go \
--replace "Test_Main" "Skip_Main"
'';
vendorSha256 = null;
buildFlagsArray = [
"-ldflags=-s -w -X main.revision=${version}"
];
installPhase = ''
install -Dm755 $GOPATH/bin/app $out/bin/reproxy
'';
meta = with lib; {
description = "Simple edge server / reverse proxy";
homepage = "https://reproxy.io/";
license = licenses.mit;
maintainers = with maintainers; [ sikmir ];
};
}
pkgs/servers/search/groonga/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "groonga";
version = "11.0.1";
version = "11.0.2";
src = fetchurl {
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
sha256 = "sha256-Ap5DdOf3PVctMAYCP0Xr4VjqO5yEWqrKX6FbId8/FMQ=";
sha256 = "sha256-3inLVkjjwphz00N0fWJqXvyzAjV9x72C3E33duLeVYw=";
};
buildInputs = with lib;
pkgs/servers/sql/postgresql/ext/pipelinedb.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl }:
{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl, libsodium, libkrb5 }:
stdenv.mkDerivation rec {
pname = "pipelinedb";
@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "1mnqpvx6g1r2n4kjrrx01vbdx7kvndfsbmm7zbzizjnjlyixz75f";
};
buildInputs = [ postgresql openssl zeromq ];
buildInputs = [ postgresql openssl zeromq libsodium libkrb5 ];
makeFlags = [ "USE_PGXS=1" ];
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lsodium";
preConfigure = ''
substituteInPlace Makefile \
--replace "/usr/lib/libzmq.a" "${zeromq}/lib/libzmq.a"
pkgs/servers/sql/postgresql/ext/timescaledb.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl }:
{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5 }:
# # To enable on NixOS:
# config.services.postgresql = {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "2.2.1";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
buildInputs = [ postgresql openssl libkrb5 ];
src = fetchFromGitHub {
owner = "timescale";
pkgs/servers/sql/postgresql/packages.nix
+1 -6
View File
@@ -6,12 +6,7 @@ self: super: {
periods = super.callPackage ./ext/periods.nix { };
postgis = super.callPackage ./ext/postgis.nix {
gdal = self.gdal.override {
postgresql = self.postgresql;
poppler = self.poppler_0_61;
};
};
postgis = super.callPackage ./ext/postgis.nix { };
pg_auto_failover = super.callPackage ./ext/pg_auto_failover.nix { };
pkgs/servers/unpackerr/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ lib, stdenv, fetchFromGitHub, buildGoModule, Cocoa, WebKit }:
buildGoModule rec {
pname = "unpackerr";
version = "0.9.4";
src = fetchFromGitHub {
owner = "davidnewhall";
repo = "unpackerr";
rev = "v${version}";
sha256 = "0ss12i8bclz1q9jgr54shvs8zgcs6jrwdm1vj9gvycyd5sx4717s";
};
vendorSha256 = "1j79vmf0mkwkqrg5j6fm2b8y3a23y039kbiqkiwb56724bmd27dd";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];
meta = with lib; {
description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import";
homepage = "https://github.com/davidnewhall/unpackerr";
maintainers = with maintainers; [ nullx76 ];
license = licenses.mit;
};
}
pkgs/servers/web-apps/bookstack/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@ let
in package.override rec {
name = "bookstack";
version = "21.04.3";
version = "21.04.5";
src = fetchFromGitHub {
owner = "bookstackapp";
repo = name;
rev = "v${version}";
sha256 = "1vkl0v3c5q0734xvvqinq4zikhy37wjys6nj1h9qdbbka0h39592";
sha256 = "0gwpa4g2xna4s3lnd970wjpr32i9cwyaixfqxhb8zbz1i9gyxjaa";
};
meta = with lib; {
pkgs/servers/web-apps/bookstack/php-packages.nix
+57 -57
View File
@@ -5,10 +5,10 @@ let
"aws/aws-sdk-php" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "aws-aws-sdk-php-0aa83b522d5ffa794c02e7411af87a0e241a3082";
name = "aws-aws-sdk-php-948a4defbe2a571cc4460725015b8e98b7060f2d";
src = fetchurl {
url = https://api.github.com/repos/aws/aws-sdk-php/zipball/0aa83b522d5ffa794c02e7411af87a0e241a3082;
sha256 = "03qahdj01bz76aar21limham7xnv5r0d61gfk1fph8ljf2gbg33i";
url = https://api.github.com/repos/aws/aws-sdk-php/zipball/948a4defbe2a571cc4460725015b8e98b7060f2d;
sha256 = "06vv6h5j909gbn2d8ih1yr2vf19jnw2va1kghj9qykvll6jzx1cq";
};
};
};
@@ -35,10 +35,10 @@ let
"doctrine/cache" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "doctrine-cache-13e3381b25847283a91948d04640543941309727";
name = "doctrine-cache-a9c1b59eba5a08ca2770a76eddb88922f504e8e0";
src = fetchurl {
url = https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727;
sha256 = "088fxbpjssp8x95qr3ip2iynxrimimrby03xlsvp2254vcyx94c5";
url = https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0;
sha256 = "0r1rdfs7k0zl6fqm35qjwbfiqmf3r3nbvfyxzig1379xsgvdd84y";
};
};
};
@@ -125,10 +125,10 @@ let
"facade/flare-client-php" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "facade-flare-client-php-6bf380035890cb0a09b9628c491ae3866b858522";
name = "facade-flare-client-php-69742118c037f34ee1ef86dc605be4a105d9e984";
src = fetchurl {
url = https://api.github.com/repos/facade/flare-client-php/zipball/6bf380035890cb0a09b9628c491ae3866b858522;
sha256 = "1y0rjlpd71jkl0zzl3q4flv5s9gbk87947xgfi8w62sg5g7jjgl2";
url = https://api.github.com/repos/facade/flare-client-php/zipball/69742118c037f34ee1ef86dc605be4a105d9e984;
sha256 = "1if56r0g9ymwankz40l5xhw5vch1qkjjy9914lz1vgbkj7ln9pvz";
};
};
};
@@ -165,10 +165,10 @@ let
"filp/whoops" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "filp-whoops-d501fd2658d55491a2295ff600ae5978eaad7403";
name = "filp-whoops-c13c0be93cff50f88bbd70827d993026821914dd";
src = fetchurl {
url = https://api.github.com/repos/filp/whoops/zipball/d501fd2658d55491a2295ff600ae5978eaad7403;
sha256 = "1mpgkl7yzw9j4pxkw404fvykapr42347lyz7jgrl1ks61pk6s9v5";
url = https://api.github.com/repos/filp/whoops/zipball/c13c0be93cff50f88bbd70827d993026821914dd;
sha256 = "0janbd93xvr5hy2bms05q1l31gmwbqrgjfvbzkmv3bfw4gcksq0i";
};
};
};
@@ -195,10 +195,10 @@ let
"guzzlehttp/psr7" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "guzzlehttp-psr7-35ea11d335fd638b5882ff1725228b3d35496ab1";
name = "guzzlehttp-psr7-dc960a912984efb74d0a90222870c72c87f10c91";
src = fetchurl {
url = https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1;
sha256 = "1nsd7sla2jpx9kzg0lzk4kvc66d30bnkf2yfzdp7gghb67wvajfa";
url = https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91;
sha256 = "06nc60wf8k6kcl89kprk04khsrrik5lnis615mx4a0m0pjn8bliz";
};
};
};
@@ -225,10 +225,10 @@ let
"laravel/framework" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "laravel-framework-d94c07d72c14f07e7d2027458e7f0a76f9ceb0d9";
name = "laravel-framework-0117d797dc1ab64b1f88d4f6b966380ea7def091";
src = fetchurl {
url = https://api.github.com/repos/laravel/framework/zipball/d94c07d72c14f07e7d2027458e7f0a76f9ceb0d9;
sha256 = "02cml6rg3qxnr8gynnd8iqwdyzflqwnyivxw034dzbm60xpg6w93";
url = https://api.github.com/repos/laravel/framework/zipball/0117d797dc1ab64b1f88d4f6b966380ea7def091;
sha256 = "11aw7smg042g8kyyhdzawmkwgbv5hkn6l6k2m27lc34v84r6kdqm";
};
};
};
@@ -245,10 +245,10 @@ let
"league/commonmark" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "league-commonmark-08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf";
name = "league-commonmark-2651c497f005de305c7ba3f232cbd87b8c00ee8c";
src = fetchurl {
url = https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf;
sha256 = "10bs8r0qiq9bybypnascvk7a7181699cnwl27yq4m108cj1i223h";
url = https://api.github.com/repos/thephpleague/commonmark/zipball/2651c497f005de305c7ba3f232cbd87b8c00ee8c;
sha256 = "0mf2avlnn0c9p4fi1jz5m85k6y7xg2p0dm1n4r7cpg25vngswmfs";
};
};
};
@@ -315,10 +315,10 @@ let
"nesbot/carbon" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "nesbot-carbon-2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4";
name = "nesbot-carbon-606262fd8888b75317ba9461825a24fc34001e1e";
src = fetchurl {
url = https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4;
sha256 = "0riizvfqxvvbkhhfadcqr8717s0q12p00qmffv26664h5kckl58r";
url = https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e;
sha256 = "0iqhb3gfmray8jkwki19pwm15vmf96vfj4m12nk7lmn74470lf2x";
};
};
};
@@ -455,10 +455,10 @@ let
"psr/log" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "psr-log-0f73288fd15629204f9d42b7055f72dacbe811fc";
name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11";
src = fetchurl {
url = https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc;
sha256 = "1npi9ggl4qll4sdxz1xgp8779ia73gwlpjxbb1f1cpl1wn4s42r4";
url = https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11;
sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln";
};
};
};
@@ -615,30 +615,30 @@ let
"symfony/console" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-console-1ba4560dbbb9fcf5ae28b61f71f49c678086cf23";
name = "symfony-console-36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625";
src = fetchurl {
url = https://api.github.com/repos/symfony/console/zipball/1ba4560dbbb9fcf5ae28b61f71f49c678086cf23;
sha256 = "1zsmv0p0xxdp44301yd3n1w9j79g631bvvfp04zniqk4h5q6kvg9";
url = https://api.github.com/repos/symfony/console/zipball/36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625;
sha256 = "0n5caxf7vgx0x6izsxfkkjdl9jw96qi7h9h0k4s8fccqqmwb61cc";
};
};
};
"symfony/css-selector" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-css-selector-f907d3e53ecb2a5fad8609eb2f30525287a734c8";
name = "symfony-css-selector-01c77324d1d47efbfd7891f62a7c256c69330115";
src = fetchurl {
url = https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8;
sha256 = "19yqy81psz2wh8gy2j3phywsgrw9sbcw83l8lbnxbk5khg8hw3nm";
url = https://api.github.com/repos/symfony/css-selector/zipball/01c77324d1d47efbfd7891f62a7c256c69330115;
sha256 = "12hd9vga35w8g4bwmlkr87pxlwdx71sp2bkxs8j854hf28yam75w";
};
};
};
"symfony/debug" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-debug-157bbec4fd773bae53c5483c50951a5530a2cc16";
name = "symfony-debug-45b2136377cca5f10af858968d6079a482bca473";
src = fetchurl {
url = https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16;
sha256 = "0v7l7081fw2wr96xv472nhi1d0xzw6lnl8hnjgi9g3gnksfagwq8";
url = https://api.github.com/repos/symfony/debug/zipball/45b2136377cca5f10af858968d6079a482bca473;
sha256 = "0p7g2mwrvg8x264kl9kn7a23adnqxh66jy1kjczq5c5xlpw2rxdb";
};
};
};
@@ -655,10 +655,10 @@ let
"symfony/error-handler" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-error-handler-48e81a375525872e788c2418430f54150d935810";
name = "symfony-error-handler-76603a8df8e001436df80758eb03a8baa5324175";
src = fetchurl {
url = https://api.github.com/repos/symfony/error-handler/zipball/48e81a375525872e788c2418430f54150d935810;
sha256 = "17hpwx8arv3h4cw4fwzkm7a39lsa92vwxsinyqmx723v1nr5z1d2";
url = https://api.github.com/repos/symfony/error-handler/zipball/76603a8df8e001436df80758eb03a8baa5324175;
sha256 = "15s46vjwzny821qq93qsnd9ig14d72rakbavgb3sd43gipyjld8g";
};
};
};
@@ -705,30 +705,30 @@ let
"symfony/http-foundation" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-http-foundation-02d968647fe61b2f419a8dc70c468a9d30a48d3a";
name = "symfony-http-foundation-1a6f87ef99d05b1bf5c865b4ef7992263e1cb081";
src = fetchurl {
url = https://api.github.com/repos/symfony/http-foundation/zipball/02d968647fe61b2f419a8dc70c468a9d30a48d3a;
sha256 = "1bq4why2v8p7wy8801bdml43xh7kb5fli16cv74bvqpwlp4cdv9f";
url = https://api.github.com/repos/symfony/http-foundation/zipball/1a6f87ef99d05b1bf5c865b4ef7992263e1cb081;
sha256 = "0da13w35j7hrkv87p8rrfxdxpksbf1dvji0ag7chwzhfg63516l6";
};
};
};
"symfony/http-kernel" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-http-kernel-0248214120d00c5f44f1cd5d9ad65f0b38459333";
name = "symfony-http-kernel-cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f";
src = fetchurl {
url = https://api.github.com/repos/symfony/http-kernel/zipball/0248214120d00c5f44f1cd5d9ad65f0b38459333;
sha256 = "032ljl732x0bs3my26wjfmxrxplz8vlxs0xzlqsxrh18lnyv6z3h";
url = https://api.github.com/repos/symfony/http-kernel/zipball/cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f;
sha256 = "0wk4nivw1w4kl7gziazvvzxzjhs7lalc2gc1pnscxj6k3gkfq6fl";
};
};
};
"symfony/mime" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-mime-1b2092244374cbe48ae733673f2ca0818b37197b";
name = "symfony-mime-7af452bf51c46f18da00feb32e1ad36db9426515";
src = fetchurl {
url = https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b;
sha256 = "0d2vhmd25d7yvh9xzl2vazx2bfsb8qyvd2kgvl9cry1va4vrpkj3";
url = https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515;
sha256 = "1rkm66zr6sfp8jw80h4vjrbpx40sqhhlpbc126x990mbzzapjlay";
};
};
};
@@ -815,20 +815,20 @@ let
"symfony/process" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-process-7e950b6366d4da90292c2e7fa820b3c1842b965a";
name = "symfony-process-f5481b22729d465acb1cea3455fc04ce84b0148b";
src = fetchurl {
url = https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a;
sha256 = "07ykgz5bjd45izf5n6jm2n27wcaa7aih2wlsiln1ffj9vqd6l1s4";
url = https://api.github.com/repos/symfony/process/zipball/f5481b22729d465acb1cea3455fc04ce84b0148b;
sha256 = "1cz0gd7lkp07dlylf8c32fjpfsm9z3d66iwx45i7b5wh5gc96ns0";
};
};
};
"symfony/routing" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-routing-69919991c845b34626664ddc9b3aef9d09d2a5df";
name = "symfony-routing-049e7c5c41f98511959668791b4adc0898a821b3";
src = fetchurl {
url = https://api.github.com/repos/symfony/routing/zipball/69919991c845b34626664ddc9b3aef9d09d2a5df;
sha256 = "0ghynrw6d9dpskhgyf3ljlz4pfmi68r3bzhr45lygadx21yacddw";
url = https://api.github.com/repos/symfony/routing/zipball/049e7c5c41f98511959668791b4adc0898a821b3;
sha256 = "1557bvcmxpa7hmcvwl9qf94l7n9x0y7xw2k3s8v85ys35fi54clw";
};
};
};
@@ -865,10 +865,10 @@ let
"symfony/var-dumper" = {
targetDir = "";
src = composerEnv.buildZipPackage {
name = "symfony-var-dumper-0da0e174f728996f5d5072d6a9f0a42259dbc806";
name = "symfony-var-dumper-c194bcedde6295f3ec3e9eba1f5d484ea97c41a7";
src = fetchurl {
url = https://api.github.com/repos/symfony/var-dumper/zipball/0da0e174f728996f5d5072d6a9f0a42259dbc806;
sha256 = "1qmv99bvq10siy8bbszqmn488cjcm70vip4xs8vxwm6x6x5cw1ia";
url = https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7;
sha256 = "0wccbr4l03asdar89bss3fhy486wjjqgjsk5iypmxaiga12ac01b";
};
};
};
pkgs/servers/zoneminder/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config
, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages
, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages
, polkit, util-linuxMinimal, x264, zlib
, coreutils, procps, psmisc, nixosTests }:
@@ -138,7 +138,7 @@ in stdenv.mkDerivation rec {
for f in includes/Event.php views/image.php ; do
substituteInPlace web/$f \
--replace "'ffmpeg " "'${ffmpeg_3}/bin/ffmpeg "
--replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
done
substituteInPlace web/includes/functions.php \
@@ -147,7 +147,7 @@ in stdenv.mkDerivation rec {
'';
buildInputs = [
curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib
curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mariadb.client pcre perl polkit x264 zlib
util-linuxMinimal # for libmount
] ++ (with perlPackages; [
# build-time dependencies