Fixing automatic update of Nginx

2 files changed, 11 insertions, 9 deletions

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index a67ffe7e905a..86b22ab5a18c 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -4,6 +4,12 @@
 , syslog ? false}:
 
 let
+  version = "1.4.4";
+  mainSrc = fetchurl {
+    url = "http://nginx.org/download/nginx-${version}.tar.gz";
+    sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w";
+  };
+
   rtmp-ext = fetchgit {
     url = git://github.com/arut/nginx-rtmp-module.git;
     rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1";
@@ -13,7 +19,7 @@ let
   dav-ext = fetchgit {
     url = git://github.com/arut/nginx-dav-ext-module.git;
     rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d";
-    sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w";
+    sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq";
   };
 
   syslog-ext = fetchgit {
@@ -24,12 +30,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "nginx-${meta.version}";
-
-  src = fetchurl {
-    url = "http://nginx.org/download/${name}.tar.gz";
-    sha256 = "116yfy0k65mwxdkld0w7c3gly77jdqlvga5hpbsw79i3r62kh4mf";
-  };
+  name = "nginx-${version}";
+  src = mainSrc;
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt
     ] ++ stdenv.lib.optional fullWebDAV expat;
@@ -61,6 +63,6 @@ stdenv.mkDerivation rec {
     description = "A reverse proxy and lightweight webserver";
     maintainers = [ stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
-    version = "1.4.4";
+    inherit version;
   };
 }
diff --git a/pkgs/servers/http/nginx/default.upstream b/pkgs/servers/http/nginx/default.upstream
index f6a12eedda42..c20139017436 100644
--- a/pkgs/servers/http/nginx/default.upstream
+++ b/pkgs/servers/http/nginx/default.upstream
@@ -4,5 +4,5 @@ version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$'
 do_overwrite() {
   ensure_hash
   set_var_value version "$CURRENT_VERSION"
-  set_var_value sha256 "$CURRENT_HASH" 2
+  set_var_value sha256 "$CURRENT_HASH"
 }