summary refs log tree commit diff
path: root/pkgs/servers/varnish
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2021-07-26 03:33:27 +0200
committerajs124 <git@ajs124.de>2021-08-12 19:08:59 +0200
commit9c765d4534e8b4a58c61f8fd0175c295a2bb86e4 (patch)
tree2537899aaf774c69d28a1a88b7cc1d40289203c4 /pkgs/servers/varnish
parent49df287d208b1b6f222e54fdca389613afbe2fa0 (diff)
downloadnixpkgs-9c765d4534e8b4a58c61f8fd0175c295a2bb86e4.tar
nixpkgs-9c765d4534e8b4a58c61f8fd0175c295a2bb86e4.tar.gz
nixpkgs-9c765d4534e8b4a58c61f8fd0175c295a2bb86e4.tar.bz2
nixpkgs-9c765d4534e8b4a58c61f8fd0175c295a2bb86e4.tar.lz
nixpkgs-9c765d4534e8b4a58c61f8fd0175c295a2bb86e4.tar.xz
nixpkgs-9c765d4534e8b4a58c61f8fd0175c295a2bb86e4.tar.zst
nixpkgs-9c765d4534e8b4a58c61f8fd0175c295a2bb86e4.zip
varnishPackages.*: fix and update dynamic module
Diffstat (limited to 'pkgs/servers/varnish')
-rw-r--r--pkgs/servers/varnish/dynamic.nix8
-rw-r--r--pkgs/servers/varnish/packages.nix15
2 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix
index 637380a5abd..78fd4d10641 100644
--- a/pkgs/servers/varnish/dynamic.nix
+++ b/pkgs/servers/varnish/dynamic.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook269, pkg-config, varnish, docutils, version, sha256 }:
 
-stdenv.mkDerivation rec {
-  version = "0.4";
+stdenv.mkDerivation {
   pname = "${varnish.name}-dynamic";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "nigoroll";
     repo = "libvmod-dynamic";
     rev = "v${version}";
-    sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
+    inherit sha256;
   };
 
   nativeBuildInputs = [ pkg-config docutils autoreconfHook269 varnish.python ];
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 1932561be8a..9876f131ff0 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -1,12 +1,19 @@
-{ callPackage, varnish60, varnish65 }:
-
-{
+{ callPackage, varnish60, varnish65, fetchFromGitHub }: {
   varnish60Packages = {
     varnish = varnish60;
     digest  = callPackage ./digest.nix   { varnish = varnish60; };
-    dynamic = callPackage ./dynamic.nix  { varnish = varnish60; };
+    dynamic = callPackage ./dynamic.nix  {
+      varnish = varnish60;
+      version = "0.4";
+      sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
+    };
   };
   varnish65Packages = {
     varnish = varnish65;
+    dynamic = callPackage ./dynamic.nix  {
+      varnish = varnish65;
+      version = "2.3.1";
+      sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88";
+    };
   };
 }