diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/http/darkhttpd/default.nix | 19 | ||||
-rw-r--r-- | pkgs/servers/minio/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/telegraf/default.nix | 14 | ||||
-rw-r--r-- | pkgs/servers/plex/raw.nix | 8 |
4 files changed, 28 insertions, 19 deletions
diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 49097fe2bfa..56bf5cd5b74 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -1,20 +1,27 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "darkhttpd"; - version = "1.12"; + version = "1.13"; - src = fetchurl { - url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2"; - sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155"; + src = fetchFromGitHub { + owner = "emikulic"; + repo = pname; + rev = "v${version}"; + sha256 = "0w11xq160q9yyffv4mw9ncp1n0dl50d9plmwxb0yijaaxls9i4sk"; }; enableParallelBuilding = true; installPhase = '' + runHook preInstall install -Dm555 -t $out/bin darkhttpd - install -Dm444 -t $out/share/doc/${pname} README + install -Dm444 -t $out/share/doc/${pname} README.md head -n 18 darkhttpd.c > $out/share/doc/${pname}/LICENSE + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 677d166a3c2..10105e3b27b 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-02-14T04-01-33Z"; + version = "2021-02-19T04-38-02Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Su3BkVZJ4c5T829/1TNQi7b0fZhpG/Ly80ynt5Po+Qs="; + sha256 = "sha256-Swm8gQeSN84SYE0M03Se9n/clYVT/W/v0GAmRRsL674="; }; - vendorSha256 = "sha256-r0QtgpIfDYu2kSy6/wSAExc3Uwd62sDEi1UZ8XzTBoU="; + vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc="; doCheck = false; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 55b0ab14af7..3a01acbb372 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "telegraf"; - version = "1.17.2"; + version = "1.17.3"; excludedPackages = "test"; @@ -12,14 +12,14 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-R0RYiVVS1ce2xabPBTEmOxBNlknP4iXkbVy412whrFw="; + sha256 = "sha256-DJvXGjh1FN6SHcfVUlbfoKgBD1ThaJMvKUqvIKCyzeI="; }; - vendorSha256 = "sha256-3cELah9i2rY563QQOYt7ke0HEUR1By74vTgl+UbOHwc="; + vendorSha256 = "sha256-UTdJT4cwRCqkn01YXB1KYc7hp1smpZFke9aAODd/2x0="; - buildFlagsArray = [ ''-ldflags= - -w -s -X main.version=${version} - '' ]; + preBuild = '' + buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") + ''; passthru.tests = { inherit (nixosTests) telegraf; }; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6c4352e23b9..c5dc1a8219d 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.3.4046-3c1c83ba4"; + version = "1.21.4.4054-bab510e86"; 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 = "1ikv75pgircqnllimx3yszihpfaj8blhrmgvli0lagirx6sg22zl"; + sha256 = "1vxh9yihwxv610q10sak3n8jrq7il6ryhqi6j10nmm7mxn1nkqcx"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1fywpkchpc726a66q7xpqrn92g73v4941df19glscrrvy7808f8n"; + sha256 = "0dxch4m3ywndrwys2rfvh34p6nsx0w2f6k7xvs7hi20biz6bd344"; }; outputs = [ "out" "basedb" ]; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p "$out/lib" cp -dr --no-preserve='ownership' usr/lib/plexmediaserver $out/lib/ @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { # to the '/db' file; we create this path in the FHS userenv (see the "plex" # package). ln -fs /db $f + runHook postInstall ''; # We're running in a FHS userenv; don't patch anything |