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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-08 20:59:05 +02:00
parent 252bf94a74 6d46d8a9b9
commit dd78ce1c53
730 changed files with 3907 additions and 1907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/clickhouse/default.nix
+2
View File
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
pname = "clickhouse";
version = "20.11.4.13";
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
src = fetchFromGitHub {
owner = "ClickHouse";
repo = "ClickHouse";
pkgs/servers/fcgiwrap/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap";
description = "Simple server for running CGI applications over FastCGI";
maintainers = with maintainers; [ lethalman ];
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
license = licenses.mit;
};
pkgs/servers/ftp/pure-ftpd/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
description = "A free, secure, production-quality and standard-conformant FTP server";
homepage = "https://www.pureftpd.org";
license = licenses.isc; # with some parts covered by BSD3(?)
maintainers = [ maintainers.lethalman ];
maintainers = [ ];
platforms = platforms.linux;
};
}
pkgs/servers/http/apache-modules/mod_dnssd/default.nix
+1 -1
View File
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
description = "Provide Zeroconf support via DNS-SD using Avahi";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ lethalman ];
maintainers = with maintainers; [ ];
};
}
pkgs/servers/matrix-synapse/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.32.2";
version = "1.33.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Biwj/zORBsU8XvpMMlSjR3Nqx0q1LqaSX/vX+UDeXI8=";
sha256 = "sha256-kH5HhkfUL+WzcX/0pK0dV1bI34TpmgRpx3m/UchdAEE=";
};
patches = [
pkgs/servers/plex/raw.nix
+3 -3
View File
@@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.22.2.4282-a97b03fad";
version = "1.23.0.4482-62106842a";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "01krx6vhk24wm2hikxkfv8m53y8b4yqnkii4j9zf48f1a9hlj2zp";
sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "04wzv15pnd4sn6cy62m8prvsxpxj4sg3q9ahwsrn2cj31vgayg0i";
sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq";
};
outputs = [ "out" "basedb" ];