diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-07 11:35:13 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-07 11:35:28 +0200 |
commit | 03e32315a533775357411d9b751622ad3a6d3892 (patch) | |
tree | 7de78b207e3863f7e0e373baec971c0b2c3bd7c3 /pkgs/development/interpreters | |
parent | 3659e44f986bc6ea003246575f5ea821bb97b173 (diff) | |
parent | f7f8de64f49b14979efd2f6519f297dc5341d908 (diff) | |
download | nixlib-03e32315a533775357411d9b751622ad3a6d3892.tar nixlib-03e32315a533775357411d9b751622ad3a6d3892.tar.gz nixlib-03e32315a533775357411d9b751622ad3a6d3892.tar.bz2 nixlib-03e32315a533775357411d9b751622ad3a6d3892.tar.lz nixlib-03e32315a533775357411d9b751622ad3a6d3892.tar.xz nixlib-03e32315a533775357411d9b751622ad3a6d3892.tar.zst nixlib-03e32315a533775357411d9b751622ad3a6d3892.zip |
Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1286624
Diffstat (limited to 'pkgs/development/interpreters')
26 files changed, 41 insertions, 24 deletions
diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 409a93447f85..1f25a2031f27 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A linear logic programming language for modeling generative interactive systems"; homepage = https://github.com/chrisamaphone/interactive-lp; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 05d896db3831..c088f02ed698 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation { system that ensure clean, correct, multithreaded designs. ''; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index d9ce07f16f76..bed5b0ef0b35 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Programming language with macros and syntax at once"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 30a2f05f0e05..27368580de09 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = http://groovy-lang.org/; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index a318498ca645..277912f76670 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = "http://www.gtk-server.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.tohl]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 55f1b1840fa0..5db3f10fb07d 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 1d05f9406b45..e17dd3638731 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Ruby interpreter written in Java"; homepage = http://jruby.org/; license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index 6f7330eed673..0db23e0efed9 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; maintainers = [ maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix index 8a1d35a6c078..76e02f90f5f7 100644 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ b/pkgs/development/interpreters/lua-5/5.0.3.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index b5ac4157d651..fa5113fd5727 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -97,6 +97,6 @@ stdenv.mkDerivation rec { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index 27ca9c9160f8..30c26a922ba9 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/lua-5/expat.nix b/pkgs/development/interpreters/lua-5/expat.nix index 243abae331a6..fb0bb5e5ff59 100644 --- a/pkgs/development/interpreters/lua-5/expat.nix +++ b/pkgs/development/interpreters/lua-5/expat.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://matthewwild.co.uk/projects/luaexpat"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.flosse ]; }; } diff --git a/pkgs/development/interpreters/lua-5/sec.nix b/pkgs/development/interpreters/lua-5/sec.nix index 08eb1c89308c..a4d14f7e9d70 100644 --- a/pkgs/development/interpreters/lua-5/sec.nix +++ b/pkgs/development/interpreters/lua-5/sec.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/brunoos/luasec"; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.flosse ]; }; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 3473a11e8198..737ded6e1bbc 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { rewriting logic computation. ''; - hydraPlatforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 5832bbea9b7d..9c669ceed68b 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "A simple Lisp with an integrated database"; homepage = http://picolisp.com/; license = licenses.mit; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ raskin tohl ]; }; diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index 877430239101..1aea9f440391 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; homepage = src.meta.homepage; license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 70f18740f686..0e368b31cdf4 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = http://www.nial.com; license = stdenv.lib.licenses.artistic1; maintainers = [ stdenv.lib.maintainers.vrthra ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 6818a996d623..b079ff003347 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Command-line REPL for the Rascal metaprogramming language"; license = stdenv.lib.licenses.epl10; maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 4630828fe87d..1bfe81241048 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation { homepage = http://s48.org/; description = "Scheme 48"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = with stdenv.lib.platforms; unix; }; src = fetchurl { diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 0e6c06bbecd3..8da41ea1a9cb 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { homepage = http://www.scsh.net/; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix index 960cd86ec27f..46dedb36de96 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix @@ -27,4 +27,8 @@ stdenv.mkDerivation rec { ''; makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1"; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index cbe2c47594d4..330d8e334acc 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { homepage = https://developer.mozilla.org/en/SpiderMonkey; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index b3fa96d756af..8279a4cd0df8 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { homepage = https://developer.mozilla.org/en/SpiderMonkey; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix index 96d73b69e626..13257a3eb338 100644 --- a/pkgs/development/interpreters/spidermonkey/24.2.nix +++ b/pkgs/development/interpreters/spidermonkey/24.2.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { homepage = https://developer.mozilla.org/en/SpiderMonkey; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/spidermonkey/31.5.nix b/pkgs/development/interpreters/spidermonkey/31.5.nix index 0a71dc567b2c..2334e1b6b7f9 100644 --- a/pkgs/development/interpreters/spidermonkey/31.5.nix +++ b/pkgs/development/interpreters/spidermonkey/31.5.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index be85cd248154..20690cbd4772 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,34 +1,22 @@ { stdenv, fetchurl, cmake, pkgconfig , libjack2, libsndfile, fftw, curl, gcc -, libXt, qt, readline +, libXt, qt55, readline , useSCEL ? false, emacs }: let optional = stdenv.lib.optional; -ljack2 = libjack2.override { gcc = gcc; }; in stdenv.mkDerivation rec { - name = "supercollider-3.6.6"; + name = "supercollider-${version}"; + version = "3.7.2"; - meta = { - description = "Programming language for real time audio synthesis"; - homepage = "http://supercollider.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - }; src = fetchurl { - url = "mirror://sourceforge/supercollider/Source/3.6/SuperCollider-3.6.6-Source.tar.bz2"; - sha256 = "11khrv6jchs0vv0lv43am8lp0x1rr3h6l2xj9dmwrxcpdayfbalr"; + url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; + sha256 = "1mybxcnl7flliz74kdfnvh18v5dwd9zbdsw2kc7wpl4idcly1n0s"; }; - # QGtkStyle unavailable - patchPhase = '' - substituteInPlace editors/sc-ide/widgets/code_editor/autocompleter.cpp \ - --replace Q_WS_X11 Q_GTK_STYLE - ''; - cmakeFlags = '' -DSC_WII=OFF -DSC_EL=${if useSCEL then "ON" else "OFF"} @@ -37,6 +25,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - gcc ljack2 libsndfile fftw curl libXt qt readline ] + gcc libjack2 libsndfile fftw curl libXt qt55.qtwebkit qt55.qttools readline ] ++ optional useSCEL emacs; + + meta = { + description = "Programming language for real time audio synthesis"; + homepage = "http://supercollider.sourceforge.net/"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; + }; } |