diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
commit | 3d8e43691731037672c36129cbecb2fe43ffad7e (patch) | |
tree | c7f5fe5732dd22a66330d041ee7b0139f75b412d /pkgs/servers | |
parent | a04625379a9e842cb987197c4f273de1bea807b7 (diff) | |
parent | 342eaba9ebbc68923c1028a56be1c94e74862832 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/documize-community/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/grocy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/jellyfin/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/nextcloud/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/victoriametrics/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/traefik/default.nix | 42 | ||||
-rw-r--r-- | pkgs/servers/unifi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/ursadb/default.nix | 35 |
9 files changed, 80 insertions, 36 deletions
diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 88cafa4d29173..f6a44c9193db0 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, nixosTests }: buildGoModule rec { pname = "documize-community"; @@ -17,6 +17,8 @@ buildGoModule rec { subPackages = [ "edition/community.go" ]; + passthru.tests = { inherit (nixosTests) documize; }; + postInstall = '' # `buildGoModule` calls `go install` (without `go build` first), so # `-o bin/documize` doesn't work. diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 2694765a948bb..a4c1722d38bd7 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, nixosTests }: stdenv.mkDerivation rec { pname = "grocy"; @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { dontBuild = true; + passthru.tests = { inherit (nixosTests) grocy; }; + installPhase = '' mkdir -p $out/ cp -R . $out/ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index a23b790ccd6e4..8d8a0fceefb40 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - stripDebugList = "lib modules bin"; + stripDebugList = [ "lib" "modules" "bin" ]; postInstall = '' mkdir -p $doc/share/doc/httpd diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index a64bd0dfc786d..932081ad22fed 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg, - fontconfig, freetype }: + fontconfig, freetype, nixosTests }: let os = if stdenv.isDarwin then "osx" else "linux"; @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.5.3"; + version = "10.5.4"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "04fq3g6yddyqiixgk45x3c90zjdhkm7glahlb71fyx8ivf1qkcvs"; + sha256 = "0jfqkbr5n5l7k3dpmjsy0bhvy4y1s6sccwcmcx239r6dhc7x0f9y"; }; buildInputs = [ @@ -49,6 +49,10 @@ in stdenv.mkDerivation rec { --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" ''; + passthru.tests = { + smoke-test = nixosTests.jellyfin; + }; + meta = with stdenv.lib; { description = "The Free Software Media System"; homepage = "https://jellyfin.github.io/"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index f8a7823e092f9..3c82c1996ef21 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, nixosTests }: let generic = { version, sha256, insecure ? false }: stdenv.mkDerivation rec { @@ -10,6 +10,8 @@ let inherit sha256; }; + passthru.tests = nixosTests.nextcloud; + installPhase = '' mkdir -p $out/ cp -R . $out/ diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 75d309fe90998..eb956b130edf8 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -1,17 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "VictoriaMetrics"; - version = "1.34.5"; + version = "1.34.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0isifyvbrv0f6l32dycka67cpnizwh2c9ns2q8pz6r2myzbdsf3s"; + sha256 = "0k4l3nq1d6f5qjx8svgga0ygv9mmhykvs3n3xr824ih6d0vrkzbg"; }; - modSha256 = "0fr5yah4qicqjfgina1ghflaz8dlzsqk3rrpsvg5l68jb6l7nxkb"; + goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics"; + meta = with lib; { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index d2a784cdf1317..0487ed177d045 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,39 +1,37 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}: +{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "traefik"; - version = "1.7.14"; - - goPackagePath = "github.com/containous/traefik"; + version = "2.2.0"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1j3p09j8rpdkp8v4d4mz224ddakkvhzchvccm9qryrqc2fq4022v"; + sha256 = "1dcazssabqxr9wv3dds3z7ks3y628qa07vgnn3hpdwxzm2b2ma92"; }; - nativeBuildInputs = [ go-bindata bash ]; - - buildPhase = '' - runHook preBuild - ( - cd go/src/github.com/containous/traefik - bash ./script/make.sh generate - - CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) - go build -ldflags "\ - -X github.com/containous/traefik/version.Version=${version} \ - -X github.com/containous/traefik/version.Codename=$CODENAME \ - " -a -o $bin/bin/traefik ./cmd/traefik - ) - runHook postBuild + modSha256 = "0w3ssxvsmq8i6hbfmn4ig2x13i2nlqy5q1khcblf9pq5vhk202qx"; + subPackages = [ "cmd/traefik" ]; + + nativeBuildInputs = [ go-bindata ]; + + passthru.tests = { inherit (nixosTests) traefik; }; + + preBuild = '' + go generate + + CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) + + makeFlagsArray+=("-ldflags=\ + -X github.com/containous/traefik/version.Version=${version} \ + -X github.com/containous/traefik/version.Codename=$CODENAME") ''; meta = with stdenv.lib; { homepage = "https://traefik.io"; description = "A modern reverse proxy"; license = licenses.mit; - maintainers = with maintainers; [ hamhut1066 vdemeester ]; + maintainers = with maintainers; [ vdemeester ]; }; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index bfee1c81870bf..3d49d4d71b5bc 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.12.35"; - sha256 = "0ln8x7yisanbx1afclhffa0f3fk0sgh7dpj548xyhn5mgpwbj4i2"; + version = "5.12.66"; + sha256 = "119jdwk2ys3vzg9wa4h25rwgl6sjly6v52k1g1ycrq0bspzxdhm2"; }; } diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix new file mode 100644 index 0000000000000..8a2f768443f58 --- /dev/null +++ b/pkgs/servers/ursadb/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, cmake, zeromq, cppzmq }: + +stdenv.mkDerivation { + name = "ursadb"; + version = "1.2.0"; + + src = fetchurl { + url = "https://github.com/CERT-Polska/ursadb/archive/v1.2.0.tar.gz"; + sha256 = "10dax3mswq0x4cfrpi31b7ii7bxl536wz1j11b7f5c0zw9pjxzym"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ursadb $out/bin/ + cp ursadb_new $out/bin/ + cp ursadb_trim $out/bin/ + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + zeromq + cppzmq + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/CERT-Polska/ursadb"; + description = "Trigram database written in C++, suited for malware indexing"; + license = licenses.bsd3; + maintainers = with maintainers; [ msm ]; + platforms = platforms.unix; + }; +} |