public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-08-03 13:34:44 +00:00
parent 3f9e8601f2 d93f917182
commit 1b979d8384
1099 changed files with 2664 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/interpreters/ceptre/default.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/clojure/default.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/falcon/default.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/groovy/default.nix
View File

@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
homepage = http://groovy-lang.org/;
license = licenses.asl20;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; unix;
};
}

1
pkgs/development/interpreters/gtk-server/default.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/guile/1.8.nix
View File

@@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.unix;
};
}

1
pkgs/development/interpreters/jruby/default.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/lolcode/default.nix
View File

@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3;
maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.unix;
};
}

1
pkgs/development/interpreters/lua-5/5.0.3.nix
View File

@@ -25,5 +25,6 @@ stdenv.mkDerivation {
for configuration, scripting, and rapid prototyping.
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/development/interpreters/lua-5/5.2.nix
View File

@@ -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;
};
}

2
pkgs/development/interpreters/lua-5/5.3.nix
View File

@@ -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;
};
}

2
pkgs/development/interpreters/lua-5/expat.nix
View File

@@ -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 ];
};
}

2
pkgs/development/interpreters/lua-5/sec.nix
View File

@@ -23,7 +23,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 ];
};
}

2
pkgs/development/interpreters/maude/default.nix
View File

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
rewriting logic computation.
'';
hydraPlatforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.peti ];
};
}

2
pkgs/development/interpreters/picolisp/default.nix
View File

@@ -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 ];
};

1
pkgs/development/interpreters/pixie/dust.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/qnial/default.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/rascal/default.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/scheme48/default.nix
View File

@@ -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 {

1
pkgs/development/interpreters/scsh/default.nix
View File

@@ -19,5 +19,6 @@ stdenv.mkDerivation {
homepage = http://www.scsh.net/;
license = licenses.bsd3;
maintainers = with maintainers; [ joachifm ];
platforms = with platforms; unix;
};
}

4
pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/spidermonkey/17.0.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/spidermonkey/24.2.nix
View File

@@ -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;
};
}

1
pkgs/development/interpreters/spidermonkey/31.5.nix
View File

@@ -56,5 +56,6 @@ stdenv.mkDerivation rec {
# TODO: MPL/GPL/LGPL tri-license.
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
};
}

31
pkgs/development/interpreters/supercollider/default.nix
View File

@@ -1,36 +1,24 @@
{ 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";
};
hardeningDisable = [ "stackprotector" ];
# 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"}
@@ -39,6 +27,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;
};
}