summary refs log tree commit diff
path: root/pkgs/servers/varnish
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2021-07-26 03:45:14 +0200
committerajs124 <git@ajs124.de>2021-08-12 19:09:00 +0200
commitd0d171cadc3350a262042767ab06ddd6e7f7c649 (patch)
tree82540174548bdc0b5dbb3a7ada52df493eecef93 /pkgs/servers/varnish
parent881f8b97eb6c2d68be2ffb26631eac2091a6570a (diff)
downloadnixpkgs-d0d171cadc3350a262042767ab06ddd6e7f7c649.tar
nixpkgs-d0d171cadc3350a262042767ab06ddd6e7f7c649.tar.gz
nixpkgs-d0d171cadc3350a262042767ab06ddd6e7f7c649.tar.bz2
nixpkgs-d0d171cadc3350a262042767ab06ddd6e7f7c649.tar.lz
nixpkgs-d0d171cadc3350a262042767ab06ddd6e7f7c649.tar.xz
nixpkgs-d0d171cadc3350a262042767ab06ddd6e7f7c649.tar.zst
nixpkgs-d0d171cadc3350a262042767ab06ddd6e7f7c649.zip
varnishPackages.*: fix and update digest module
Diffstat (limited to 'pkgs/servers/varnish')
-rw-r--r--pkgs/servers/varnish/digest.nix2
-rw-r--r--pkgs/servers/varnish/packages.nix12
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix
index 3f5c6aa4381..31aaad835bd 100644
--- a/pkgs/servers/varnish/digest.nix
+++ b/pkgs/servers/varnish/digest.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, version, sha256 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, varnish, libmhash, docutils, coreutils, version, sha256 }:
 
 stdenv.mkDerivation rec {
   pname = "${varnish.name}-digest";
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index c8afc50e498..647247acafd 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -1,26 +1,26 @@
 { callPackage, varnish60, varnish65, fetchFromGitHub }: {
-  varnish60Packages = {
+  varnish60Packages = rec {
     varnish = varnish60;
     digest  = callPackage ./digest.nix {
-      varnish = varnish60;
+      inherit varnish;
       version = "libvmod-digest-1.0.2";
       sha256 = "0jwkqqalydn0pwfdhirl5zjhbc3hldvhh09hxrahibr72fgmgpbx";
     };
     dynamic = callPackage ./dynamic.nix  {
-      varnish = varnish60;
+      inherit varnish;
       version = "0.4";
       sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
     };
   };
-  varnish65Packages = {
+  varnish65Packages = rec {
     varnish = varnish65;
     digest  = callPackage ./digest.nix {
-      varnish = varnish65;
+      inherit varnish;
       version = "6.6";
       sha256 = "0n33g8ml4bsyvcvl5lk7yng1ikvmcv8dd6bc1mv2lj4729pp97nn";
     };
     dynamic = callPackage ./dynamic.nix  {
-      varnish = varnish65;
+      inherit varnish;
       version = "2.3.1";
       sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88";
     };