diff options
author | Ryan Scheel (Havvy) <ryan.havvy@gmail.com> | 2015-04-09 19:57:37 +0200 |
---|---|---|
committer | Cray Elliott <MP2E@archlinux.us> | 2015-04-15 21:01:48 -0700 |
commit | 459133ce720e7c162f29d86499e9816f040daf29 (patch) | |
tree | 3f0a06a11f81ff2866deb7814e4e1526916f1ed3 /pkgs | |
parent | 13f6f9046db593671fc4d59e4c0b0b5f09902796 (diff) | |
download | nixlib-459133ce720e7c162f29d86499e9816f040daf29.tar nixlib-459133ce720e7c162f29d86499e9816f040daf29.tar.gz nixlib-459133ce720e7c162f29d86499e9816f040daf29.tar.bz2 nixlib-459133ce720e7c162f29d86499e9816f040daf29.tar.lz nixlib-459133ce720e7c162f29d86499e9816f040daf29.tar.xz nixlib-459133ce720e7c162f29d86499e9816f040daf29.tar.zst nixlib-459133ce720e7c162f29d86499e9816f040daf29.zip |
Remove nightly derivations for iojs
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/web/iojs/default.nix | 12 | ||||
-rwxr-xr-x | pkgs/development/web/iojs/update-iojs | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 10 insertions, 19 deletions
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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1098654ccaa..aafb8a12ff63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1814,7 +1814,6 @@ let nodePackages = callPackage ./node-packages.nix { self = nodePackages; }; iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; }; - iojs-nightly = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; nightly = true; }; iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; |