From 459133ce720e7c162f29d86499e9816f040daf29 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Thu, 9 Apr 2015 19:57:37 +0200
Subject: Remove nightly derivations for iojs

---
 pkgs/development/web/iojs/default.nix | 12 ++++--------
 pkgs/development/web/iojs/update-iojs | 16 ++++++----------
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'pkgs/development/web')

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index 45586c1e9bd7..fa9b680f2816 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,18 +1,14 @@
-{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }:
+{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv }:
 
 let
-  version = if nightly then "1.6.5-nightly20150409ff74931107" else "1.6.4";
+  version = "1.6.4";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
-    url = if nightly
-          then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz"
-          else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = if nightly
-             then "04f7r4iv8p0jfylw4sxg3vsv14rbsi6n9hbqnwvdh6554yrm6d35"
-             else "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7";
+    url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
+    sha256 = "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7";
   };
 
   prePatch = ''
diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs
index 4e01ecfd63e0..837238f27c62 100755
--- a/pkgs/development/web/iojs/update-iojs
+++ b/pkgs/development/web/iojs/update-iojs
@@ -18,7 +18,7 @@ latest() {
 latest_log() {
     echo "Getting latest $1 version from $2" >&2
     version=$(latest "$2")
-    echo " -> $version" >&2
+    echo "version -> $version" >&2
     echo "$version"
 }
 
@@ -35,20 +35,16 @@ hash() {
 hash_log() {
     echo "Finding hash for $1" >&2
     value=$(hash "$1")
-    echo " -> $value" >&2
+    echo "hash -> $value" >&2
     echo "$value"
 }
 
-stable=$(latest_log stable 'https://iojs.org/dist/')
-nightly=$(latest_log nightly 'https://iojs.org/download/nightly/')
+stableVersion=$(latest_log stable 'https://iojs.org/dist/')
+stableHash=$(hash_log "$(url iojs.src)")
 
 sed -i \
-    "/version = if nightly/s/then.*/then \"$nightly\" else \"$stable\";/" \
+    "/version = /s/\"[^\"]*\"/\"$stableVersion\"/" \
     "$HERE/default.nix"
-
-stableHash=$(hash_log "$(url iojs.src)")
-nightlyHash=$(hash_log "$(url iojs-nightly.src)")
-
 sed -i \
-    "/sha256 = if nightly/{N;s/\"[^\"]*\"/\"$nightlyHash\"/;N;s/\"[^\"]*\";/\"$stableHash\";/}" \
+    "/sha256 = /s/\"[^\"]*\"/\"$stableHash\"/" \
     "$HERE/default.nix"
-- 
cgit 1.4.1