diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-28 17:13:59 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-28 17:13:59 +0200 |
| commit | 77604964b695c3fba644684198a4c1f3bf8f607d (patch) | |
| tree | 126e7d89165d72b75ab78b0b057ec5588e2a3e0c /pkgs/development/interpreters | |
| parent | 3e1afeaa5b83559698fb6fa3a45947f3e14da534 (diff) | |
| parent | bc2a06aa3d88b7d093d84663b210a75c66c93ef0 (diff) | |
| download | nixlib-77604964b695c3fba644684198a4c1f3bf8f607d.tar nixlib-77604964b695c3fba644684198a4c1f3bf8f607d.tar.gz nixlib-77604964b695c3fba644684198a4c1f3bf8f607d.tar.bz2 nixlib-77604964b695c3fba644684198a4c1f3bf8f607d.tar.lz nixlib-77604964b695c3fba644684198a4c1f3bf8f607d.tar.xz nixlib-77604964b695c3fba644684198a4c1f3bf8f607d.tar.zst nixlib-77604964b695c3fba644684198a4c1f3bf8f607d.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/interpreters')
4 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index b4a0b77e7054..d1c8cf15fcee 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.7"; + version = "0.7.3"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { inherit name; meta = { - homepage = "https://code.google.com/p/chibi-scheme/"; + homepage = "https://github.com/ashinn/chibi-scheme"; description = "Small Footprint Scheme for use as a C Extension Language"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ]; }; - src = fetchurl { - url = "http://abrek.synthcode.com/${name}.tgz"; - sha256 = "1hhkq0khgi8i24xv66y7r6pgk1issn1i2bf7rv91rbk0wm0kv7qm"; + src = fetchFromGitHub { + owner = "ashinn"; + repo = "chibi-scheme"; + rev = version; + sha256 = "05b17flppkll1a2c2aq6lxh4iif4pjmpxmyrmiqzk0ls85gvai2x"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 62568c40c784..a39e79badb6c 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz"; - sha256="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; + sha256 = "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; }; buildInputs = [ diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream index 6a3b3a8357c2..4a94595f7723 100644 --- a/pkgs/development/interpreters/lush/default.upstream +++ b/pkgs/development/interpreters/lush/default.upstream @@ -1,3 +1,4 @@ url http://sourceforge.net/projects/lush/files/lush2/ version_link '[.]tar[.]gz/download$' SF_redirect +minimize_overwrite diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index d9cc7775d090..a2ecfb2ef97a 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }: stdenv.mkDerivation rec { version = "17.0.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python zip libffi readline ]; + buildInputs = [ pkgconfig perl python2 zip libffi readline ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; |