diff options
Diffstat (limited to 'pkgs/development/interpreters')
12 files changed, 94 insertions, 69 deletions
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index e723133e256d..f1e2315d7941 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,45 +1,35 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, sbcl }: + +stdenv.mkDerivation rec { + name = "acl2-${version}"; + version = "v6-5"; - version = a.lib.attrByPath ["version"] "v6-5" a; - buildInputs = with a; [ - sbcl - ]; -in -rec { src = fetchurl { url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz"; sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g"; name = "acl2-${version}.tar.gz"; }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ sbcl ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doDeploy" "doBuild"]; - - makeFlags = ["LISP='${a.sbcl}/bin/sbcl'"]; + phases = "unpackPhase installPhase"; installSuffix = "acl2"; - doDeploy = (a.simplyShare installSuffix); - doBuild = a.fullDepEntry ('' + + installPhase = '' + mkdir -p $out/share/${installSuffix} + cp -R . $out/share/${installSuffix} cd $out/share/${installSuffix} - make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000' - make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000' regression - mkdir -p "$out/bin" - cp saved_acl2 "$out/bin/acl2" - '') ["doDeploy" "addInputs" "defEnsureDir"]; - - name = "acl2-" + version; + make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' + make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' regression + make LISP=${sbcl}/bin/sbcl TAGS + mkdir -p $out/bin + cp saved_acl2 $out/bin/acl2 + ''; + meta = { description = "An interpreter and a prover for a Lisp dialect"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = with stdenv.lib.maintainers; [ raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix new file mode 100644 index 000000000000..4eb86460be9a --- /dev/null +++ b/pkgs/development/interpreters/bats/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "bats-${version}"; + version = "0.4.0"; + + src = fetchzip { + url = "https://github.com/sstephenson/bats/archive/v${version}.tar.gz"; + sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm"; + }; + + installPhase = "./install.sh $out"; + + meta = with stdenv.lib; { + homepage = https://github.com/sstephenson/bats; + description = "Bash Automated Testing System"; + maintainers = [ maintainers.lnl7 ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 642bde39e7e9..25b0b02a33bc 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "0s3j7ra9gb2p3dwgfxghvc9mkv6ffgvz27aj5wgwk0xq2d9fws4z"; + sha256 = "0ml0sl1l5ibb8qh505fsd7y87wq9qjvaxw9y1dyfcw00d3i1z989"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 72e89def4f50..e78b74347198 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, readline }: -let version = "2015-05-04"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "picoc-${version}"; + version = "2015-05-04"; src = fetchFromGitHub { sha256 = "01w3jwl0vn9fsmh7p20ad4nl9ljzgfn576yvncd9pk9frx3pd8y4"; @@ -11,26 +11,6 @@ stdenv.mkDerivation { owner = "zsaleeba"; }; - meta = with stdenv.lib; { - inherit version; - description = "Very small C interpreter for scripting"; - longDescription = '' - PicoC is a very small C interpreter for scripting. It was originally - written as a script language for a UAV's on-board flight system. It's - also very suitable for other robotic, embedded and non-embedded - applications. The core C source code is around 3500 lines of code. It's - not intended to be a complete implementation of ISO C but it has all the - essentials. When compiled it only takes a few k of code space and is also - very sparing of data space. This means it can work well in small embedded - devices. - ''; - homepage = https://github.com/zsaleeba/picoc; - downloadPage = https://code.google.com/p/picoc/downloads/list; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; - }; - buildInputs = [ readline ]; postPatch = '' @@ -50,4 +30,23 @@ stdenv.mkDerivation { mkdir -p $out/include install -m644 *.h $out/include ''; + + meta = with stdenv.lib; { + description = "Very small C interpreter for scripting"; + longDescription = '' + PicoC is a very small C interpreter for scripting. It was originally + written as a script language for a UAV's on-board flight system. It's + also very suitable for other robotic, embedded and non-embedded + applications. The core C source code is around 3500 lines of code. It's + not intended to be a complete implementation of ISO C but it has all the + essentials. When compiled it only takes a few k of code space and is also + very sparing of data space. This means it can work well in small embedded + devices. + ''; + homepage = https://github.com/zsaleeba/picoc; + downloadPage = https://code.google.com/p/picoc/downloads/list; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 129c0ac60774..d22d3849b1bf 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ]; @@ -51,8 +51,10 @@ stdenv.mkDerivation rec { cd src/build ''; - configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ] - ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]; + shared = if stdenv.isDarwin then "dylib" else "shared"; + configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] + ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] + ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ]; configureScript = "../configure"; @@ -78,6 +80,6 @@ stdenv.mkDerivation rec { homepage = http://racket-lang.org/; license = licenses.lgpl3; maintainers = with maintainers; [ kkallio henrytill ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index dc9323f40efd..cd1631e23a16 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rakudo-star-${version}"; - version = "2015.03"; + version = "2015.11"; src = fetchurl { url = "http://rakudo.org/downloads/star/${name}.tar.gz"; - sha256 = "1fwvmjyc1bv3kq7p25xyl4sqinp19mbrspmf0h7rvxlwnfcrr5mv"; + sha256 = "1rzabg8daxf2g4l1njhdv3gfav91mp3y9my0mpz2xw06cxqfsjki"; }; buildInputs = [ icu zlib gmp readline jdk perl ]; diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix index d050faca2454..c5b9fba37aa0 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix @@ -18,7 +18,8 @@ # Normal gem packages can be used outside of bundler; a binstub is created in # $out/bin. -{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, buildRubyGem +{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, + buildRubyGem, darwin } @ defs: lib.makeOverridable ( @@ -85,6 +86,7 @@ stdenv.mkDerivation (attrs // { buildInputs = [ ruby rubygems makeWrapper ] ++ lib.optionals (type == "git") [ git bundler ] + ++ lib.optional stdenv.isDarwin darwin.libobjc ++ buildInputs; name = attrs.name or (namePrefix + gemName); diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb index 647b83b52c38..48ab5270c22f 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb @@ -107,7 +107,6 @@ if spec.executables.any? spec.executables.each do |exe| wrapper = File.join(bin_dir, exe) File.open(wrapper, "w") do |f| - stub = generate_stub(spec.name, exe) f.write(<<-EOF) #!#{ruby} # diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index e5e17e142f41..4ffef385a0db 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -255,4 +255,16 @@ in { git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; }; }; + + ruby_2_3_0 = generic { + majorVersion = "2"; + minorVersion = "3"; + teenyVersion = "0"; + patchLevel = "0"; + sha256 = { + # src = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx"; + src = "01z5cya4a7y751d4pb3aak5qcwmmvnwkbgz9z171p8hsbw7acnxs"; + git = "0nl0pp96m0jxi422mqx09jqn9bff90pzz0xxa0ikrx7by0g00npg"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/gemconfig/default.nix b/pkgs/development/interpreters/ruby/gemconfig/default.nix index ae8c0ee6e6ad..787c3be54e35 100644 --- a/pkgs/development/interpreters/ruby/gemconfig/default.nix +++ b/pkgs/development/interpreters/ruby/gemconfig/default.nix @@ -79,7 +79,6 @@ in "--with-exslt-lib=${libxslt}/lib" "--with-exslt-include=${libxslt}/include" ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; - buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; }; patron = attrs: { @@ -143,10 +142,6 @@ in ''; }; - unf_ext = attrs: { - buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; - }; - xapian-ruby = attrs: { # use the system xapian dontBuild = false; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 286301dc0a5d..18e2ab9231ad 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -141,4 +141,9 @@ rec { "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch" ]; + "2.3.0" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.3.0/railsexpress/01-skip-broken-tests.patch" + "${patchSet}/patches/ruby/2.3.0/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.3.0/railsexpress/03-display-more-detailed-stack-trace.patch" + ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index f12402f0a0b7..238a70b5d807 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "8ccf24490fec2218374734520c27d925078096de"; - sha256 = "88418484d2d3963975190836eafb2e28206e3e2bac9ee7c6208645bfe7428e2f"; + rev = "84d0634ce5639781c4d8e9396ec20341d6524901"; + sha256 = "06x2r43i8kpcmk6s5idrc3z49p8vy18b2lsh1jdqla69i5z2vqlf"; } |