From 05cc2b1f514da3e5337595c5bbaee7d6681f9585 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 30 Mar 2020 14:15:58 +0200 Subject: unifiStable: 5.12.35 -> 5.12.66 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index f86ae9d7cec4..d077d5a9cb26 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"; }; } -- cgit 1.4.1 From 5160beb88661da6f1876ea9685631f2e47a84008 Mon Sep 17 00:00:00 2001 From: msm Date: Wed, 1 Apr 2020 00:54:17 +0200 Subject: ursadb: init at v1.2.0 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/servers/ursadb/default.nix | 35 +++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/servers/ursadb/default.nix (limited to 'pkgs/servers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 351ce32e936c..146d475e87a8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5186,6 +5186,12 @@ githubId = 133448; name = "Mikołaj Siedlarek"; }; + msm = { + email = "msm@tailcall.net"; + github = "msm-code"; + githubId = 7026881; + name = "Jarosław Jedynak"; + }; mstarzyk = { email = "mstarzyk@gmail.com"; github = "mstarzyk"; diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix new file mode 100644 index 000000000000..8a2f768443f5 --- /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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 954b0246da2b..046385d61ae9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7156,6 +7156,8 @@ in urlview = callPackage ../applications/misc/urlview {}; + ursadb = callPackage ../servers/ursadb {}; + usbmuxd = callPackage ../tools/misc/usbmuxd {}; usync = callPackage ../applications/misc/usync { }; -- cgit 1.4.1 From 7547cf9dfcc36a36939d3b97ca766f64a1012ad3 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 6 Apr 2020 20:32:19 -0700 Subject: treewide: Fix up stripDebugList attrs to be lists. The documentation says this should be a list, and it already is in about half the expressions that set it. The difference doesn't matter at present, because these values are all space-free literals. But it will in a future with __structuredAttrs . (The similar attr stripAllList has no users in the nixpkgs tree, so there's nothing to do to fix any of those up.) --- pkgs/applications/misc/far2l/default.nix | 2 +- pkgs/development/libraries/ldb/default.nix | 2 +- pkgs/development/misc/avr/libc/default.nix | 2 +- pkgs/os-specific/linux/syslinux/default.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 7c6573630a15..572ec3dda15e 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/far2l --argv0 $out/bin/far2l ''; - stripDebugList = "bin share"; + stripDebugList = [ "bin" "share" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 7ee869b53c35..a0cb8a7762b5 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--without-ldb-lmdb" ]; - stripDebugList = "bin lib modules"; + stripDebugList = [ "bin" "lib" "modules" ]; meta = with stdenv.lib; { description = "A LDAP-like embedded database"; diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 48ea088a73c9..84e9c0751342 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ automake autoconf ]; # Make sure we don't strip the libraries in lib/gcc/avr. - stripDebugList = "bin"; + stripDebugList = [ "bin" ]; dontPatchELF = true; passthru = { diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index ed901b21ac11..02d19c8a2029 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...' hardeningDisable = [ "pic" "stackprotector" "fortify" ]; - stripDebugList = "bin sbin share/syslinux/com32"; + stripDebugList = [ "bin" "sbin" "share/syslinux/com32" ]; makeFlags = [ "BINDIR=$(out)/bin" diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 252365098ddc..658de79385a9 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 -- cgit 1.4.1 From a94fedc20dafb5f463608b6807f16fb9193916ca Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 12 Apr 2020 04:20:00 -0500 Subject: victoriametrics: 1.34.5 -> 1.34.7 --- pkgs/servers/nosql/victoriametrics/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 75d309fe9099..eb956b130edf 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"; -- cgit 1.4.1 From 07f1844c582e80087bc721ea032ec3400d47bec3 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Sun, 29 Dec 2019 16:01:19 +0100 Subject: traefik: 1.7.14 -> 2.2.0 --- pkgs/servers/traefik/default.nix | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index d2a784cdf131..cb3f01d77ee2 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,39 +1,35 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}: +{ stdenv, buildGoModule, fetchFromGitHub, go-bindata }: -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 ]; + + 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 ]; }; } -- cgit 1.4.1 From 9360e3723dd9a0c3aa13000bfce2ccc2a974a27e Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Mon, 6 Apr 2020 08:21:35 +0200 Subject: nixos/traefik: add test --- nixos/tests/all-tests.nix | 2 + nixos/tests/traefik.nix | 87 ++++++++++++++++++++++++++++++++++++++++ pkgs/servers/traefik/default.nix | 4 +- 3 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/traefik.nix (limited to 'pkgs/servers') diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5819879b30e9..4f60892488ab 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -303,6 +303,8 @@ in timezone = handleTest ./timezone.nix {}; tinydns = handleTest ./tinydns.nix {}; tor = handleTest ./tor.nix {}; + # traefik test relies on docker-containers + traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {}; transmission = handleTest ./transmission.nix {}; trac = handleTest ./trac.nix {}; trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; diff --git a/nixos/tests/traefik.nix b/nixos/tests/traefik.nix new file mode 100644 index 000000000000..0e21a7cf8437 --- /dev/null +++ b/nixos/tests/traefik.nix @@ -0,0 +1,87 @@ +# Test Traefik as a reverse proxy of a local web service +# and a Docker container. +import ./make-test-python.nix ({ pkgs, ... }: { + name = "traefik"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ joko ]; + }; + + nodes = { + client = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + }; + traefik = { config, pkgs, ... }: { + docker-containers.nginx = { + extraDockerOptions = [ + "-l" "traefik.enable=true" + "-l" "traefik.http.routers.nginx.entrypoints=web" + "-l" "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)" + ]; + image = "nginx-container"; + imageFile = pkgs.dockerTools.examples.nginx; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + + services.traefik = { + enable = true; + + dynamicConfigOptions = { + http.routers.simplehttp = { + rule = "Host(`simplehttp.traefik.test`)"; + entryPoints = [ "web" ]; + service = "simplehttp"; + }; + + http.services.simplehttp = { + loadBalancer.servers = [{ + url = "http://127.0.0.1:8000"; + }]; + }; + }; + + staticConfigOptions = { + global = { + checkNewVersion = false; + sendAnonymousUsage = false; + }; + + entryPoints.web.address = ":80"; + + providers.docker.exposedByDefault = false; + }; + }; + + systemd.services.simplehttp = { + script = "${pkgs.python3}/bin/python -m http.server 8000"; + serviceConfig.Type = "simple"; + wantedBy = [ "multi-user.target" ]; + }; + + users.users.traefik.extraGroups = [ "docker" ]; + }; + }; + + testScript = '' + start_all() + + traefik.wait_for_unit("docker-nginx.service") + traefik.wait_until_succeeds("docker ps | grep nginx-container") + traefik.wait_for_unit("simplehttp.service") + traefik.wait_for_unit("traefik.service") + traefik.wait_for_open_port(80) + traefik.wait_for_unit("multi-user.target") + + client.wait_for_unit("multi-user.target") + + with subtest("Check that a container can be reached via Traefik"): + assert "Hello from NGINX" in client.succeed( + "curl -sSf -H Host:nginx.traefik.test http://traefik/" + ) + + with subtest("Check that dynamic configuration works"): + assert "Directory listing for " in client.succeed( + "curl -sSf -H Host:simplehttp.traefik.test http://traefik/" + ) + ''; +}) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index cb3f01d77ee2..0487ed177d04 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, go-bindata }: +{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, nixosTests }: buildGoModule rec { pname = "traefik"; @@ -16,6 +16,8 @@ buildGoModule rec { nativeBuildInputs = [ go-bindata ]; + passthru.tests = { inherit (nixosTests) traefik; }; + preBuild = '' go generate -- cgit 1.4.1 From dff99df6ea930cec9ab1670c5e6abd17933db975 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 13 Apr 2020 12:40:01 +0200 Subject: jellyfin: 10.5.3 -> 10.5.4 --- pkgs/servers/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index a64bd0dfc786..9adc513307cc 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -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 = [ -- cgit 1.4.1 From 01d351651973d1ff51fca4d784db56cacdc1a28e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 13 Apr 2020 12:47:26 +0200 Subject: jellyfin: add link to nixos test --- pkgs/servers/jellyfin/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 9adc513307cc..932081ad22fe 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"; @@ -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/"; -- cgit 1.4.1 From 37fe88e227552d6fefb53c74e70f8366ee43d469 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 15 Apr 2020 22:00:14 +0200 Subject: grocy: add `passthru.tests` to reference VM-test --- pkgs/servers/grocy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 2694765a948b..a4c1722d38bd 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/ -- cgit 1.4.1 From 2da253a7ded5942283049b3a83388123adc27ab6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 15 Apr 2020 22:13:46 +0200 Subject: documize-community: add `passthru.tests` to reference VM-test --- pkgs/servers/documize-community/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 88cafa4d2917..f6a44c9193db 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. -- cgit 1.4.1 From 1b95c71989bb8b75769d62e067f8d0e3f544adc9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 15 Apr 2020 22:14:04 +0200 Subject: nextcloud*: add `passthru.tests` to reference VM-tests --- pkgs/servers/nextcloud/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index f8a7823e092f..3c82c1996ef2 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/ -- cgit 1.4.1