From 7ebcada02028e5ce8199cc123fda6aa1aba72e64 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Wed, 28 Dec 2016 00:19:51 -0500 Subject: mesos: 1.0.1 -> 1.1.0 --- .../development/interpreters/python/build-python-package-setuptools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index f077533ecfe4..eab103726742 100644 --- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix +++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix @@ -53,4 +53,4 @@ in attrs // { fi ${postShellHook} ''; -} \ No newline at end of file +} -- cgit 1.4.1 From ad3e589c6dea250e9913909b56602fd51edddf30 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 10 Jan 2017 01:09:53 -0600 Subject: erlangR19: 19.1.6 -> 19.2 Include sw_vers patch as discussed on #21775. --- pkgs/development/interpreters/erlang/R19.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 824c68688803..d08c4e517cb7 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -21,7 +21,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "19.1.6"; + version = "19.2"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "120dqi8h2fwqfmh9g2nmkf153zlglzw9kkddz57xqvqq5arcs72y"; + sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk"; }; buildInputs = @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { debugInfo = enableDebugInfo; + prePatch = '' + substituteInPlace configure.in \ + --replace '`sw_vers -productVersion`' '10.10' + ''; + preConfigure = '' ./otp_build autoconf ''; -- cgit 1.4.1 From 666810cd25d7309f609a5c40231b52b8848b4222 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 14 Jan 2017 20:30:57 +0100 Subject: elixir: 1.3.3 -> 1.4.0 --- pkgs/development/interpreters/elixir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 6999ee07e3d0..2d27185a9fca 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "elixir"; rev = "v${version}"; - sha256 = "1l4ff3awil1nzrgd4pv4bx6n9ml83ci4czplv03yfz18q7jbipq2"; + sha256 = "1q05f1s581nk475a8d9hakh2irgvsg50x3084yjzhrcmmykwnysi"; }; buildInputs = [ erlang rebar makeWrapper ]; -- cgit 1.4.1 From b8acb928ccca8d1fdf6de996a8dd41ced0d7bad6 Mon Sep 17 00:00:00 2001 From: "Andrew R. M" Date: Wed, 18 Jan 2017 09:32:59 -0500 Subject: hy: init at 0.11.1 This is the hy language, a dialect of lisp designed to be closely intergrated with python. --- lib/maintainers.nix | 1 + pkgs/development/interpreters/hy/default.nix | 22 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 36 ++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 pkgs/development/interpreters/hy/default.nix (limited to 'pkgs/development/interpreters') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4cbedd7be031..a58e6aa7539c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -329,6 +329,7 @@ nicknovitski = "Nick Novitski "; nico202 = "Nicolò Balzarotti "; NikolaMandic = "Ratko Mladic "; + nixy = "Andrew R. M. "; notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix new file mode 100644 index 000000000000..ee6ac6d39e53 --- /dev/null +++ b/pkgs/development/interpreters/hy/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "hy-${version}"; + version = "0.11.1"; + + src = fetchurl { + url = "mirror://pypi/h/hy/${name}.tar.gz"; + sha256 = "1msqv747iz12r73mz4qvsmlwkddwjvrahlrk7ysrcz07h7dsscxs"; + }; + + buildInputs = [ pythonPackages.appdirs ]; + propagatedBuildInputs = [ pythonPackages.clint pythonPackages.astor pythonPackages.rply ]; + + meta = { + description = "A LISP dialect embedded in Python"; + homepage = http://hylang.org/; + license = stdenv.lib.licenses.mit; + maintainers = stdenv.lib.maintainers.nixy; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c247b5dddf6..73a249e169c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17923,4 +17923,6 @@ in fpm2 = callPackage ../tools/security/fpm2 { }; simplenote = callPackage ../applications/misc/simplenote { }; + + hy = callPackage ../development/interpreters/hy {}; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0141729e30f..e5840effca3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1064,6 +1064,23 @@ in { }; }; + astor = buildPythonPackage rec { + name = "astor-${version}"; + version = "0.5"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/astor/${name}.tar.gz"; + sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa"; + }; + + meta = with pkgs.stdenv.lib; { + descriptions = "Library for reading, writing and rewriting python AST"; + homepage = https://github.com/berkerpeksag/astor; + license = licenses.bsd3; + maintainers = with maintainers; [ nixy ]; + }; + }; + asyncio = if (pythonAtLeast "3.3") then buildPythonPackage rec { name = "asyncio-${version}"; version = "3.4.3"; @@ -22797,6 +22814,25 @@ in { }); + rply = buildPythonPackage rec { + name = "rply-${version}"; + version = "0.7.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/r/rply/${name}.tar.gz"; + sha256 = "12rp1d9ba7nvd5rhaxi6xzx1rm67r1k1ylsrkzhpwnphqpb06cvj"; + }; + + buildInputs = with self; [ appdirs ]; + + meta = with pkgs.stdenv.lib; { + descriptions = "A python Lex/Yacc that works with RPython"; + homepage = https://github.com/alex/rply; + license = licenses.bsd3; + maintainers = with maintainers; [ nixy ]; + }; + }; + rpm = (pkgs.rpm.override{inherit python;}); rpy2 = buildPythonPackage rec { -- cgit 1.4.1 From 9cb67274fc71b0700a9ef18ece6195173783df84 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 19 Jan 2017 16:48:27 +0100 Subject: treewide: fix evaluation cc @Mic92 @nixy @7c6f434c --- pkgs/development/interpreters/hy/default.nix | 2 +- pkgs/development/python-modules/flask-wtf.nix | 2 +- pkgs/development/python-modules/ghdiff.nix | 2 +- pkgs/development/python-modules/twill/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index ee6ac6d39e53..e1ce01b59068 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { description = "A LISP dialect embedded in Python"; homepage = http://hylang.org/; license = stdenv.lib.licenses.mit; - maintainers = stdenv.lib.maintainers.nixy; + maintainers = [ stdenv.lib.maintainers.nixy ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf.nix index f8f947366806..24e66ea4e987 100644 --- a/pkgs/development/python-modules/flask-wtf.nix +++ b/pkgs/development/python-modules/flask-wtf.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple integration of Flask and WTForms."; - license = licenses.bsd; + license = licenses.bsd3; maintainers = [ maintainers.mic92 ]; homepage = https://github.com/lepture/flask-wtf/; }; diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff.nix index 156d9f23729b..1f14b661d53e 100644 --- a/pkgs/development/python-modules/ghdiff.nix +++ b/pkgs/development/python-modules/ghdiff.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = https://github.com/kilink/ghdiff; - license = license.mit; + license = licenses.mit; description = "Generate Github-style HTML for unified diffs."; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 6d4e3cbf1df3..f3e7bb7025bc 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "a simple scripting language for Web browsing"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ Mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } -- cgit 1.4.1 From a7f25fe16793ba50cb015034513ee6b40e0eb016 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 1 Oct 2016 21:16:55 +0200 Subject: php: add embedded package --- pkgs/development/interpreters/php/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 1a5bed6d20b9..920bf2c3207a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -38,6 +38,10 @@ let buildInputs = [apacheHttpd]; }; + embed = { + configureFlags = ["--enable-embed"]; + }; + # Extensions imap = { configureFlags = [ @@ -230,6 +234,7 @@ let pdo_mysqlSupport = config.php.pdo_mysql or true; libxml2Support = config.php.libxml2 or true; apxs2Support = config.php.apxs2 or (!stdenv.isDarwin); + embedSupport = config.php.embed or false; bcmathSupport = config.php.bcmath or true; socketsSupport = config.php.sockets or true; curlSupport = config.php.curl or true; @@ -263,13 +268,15 @@ let configurePhase = '' # Don't record the configure flags since this causes unnecessary - # runtime dependencies. + # runtime dependencies - except for php-embed, as uwsgi needs them. + ${lib.optionalString (!(config.php.embed or false)) '' for i in main/build-defs.h.in scripts/php-config.in; do substituteInPlace $i \ --replace '@CONFIGURE_COMMAND@' '(omitted)' \ --replace '@CONFIGURE_OPTIONS@' "" \ --replace '@PHP_LDFLAGS@' "" done + ''} [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin ./configure --with-config-file-scan-dir=/etc/php.d --with-config-file-path=$out/etc --prefix=$out $configureFlags diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23a3eae8385b..a30602fdad4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5756,6 +5756,14 @@ in php70 php71; + php-embed = php71-embed; + + php71-embed = php71.override { + config.php.embed = true; + config.php.apxs2 = false; + }; + + picoc = callPackage ../development/interpreters/picoc {}; picolisp = callPackage ../development/interpreters/picolisp {}; -- cgit 1.4.1 From 35fdfd88d4e2f56e243ff8f4d803f9320b23cf9c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 20 Jan 2017 11:54:03 +0100 Subject: php56: 5.6.29 -> 5.6.30 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 920bf2c3207a..651b22ff409b 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -309,8 +309,8 @@ let in { php56 = generic { - version = "5.6.29"; - sha256 = "1fr530x1hxpaf0gb1ayrs9a4xa9v14dfb4hn2560dgm7i96896s9"; + version = "5.6.30"; + sha256 = "01krq8r9xglq59x376zlg261yikckq179jmhnlcg3gqxza9w41d1"; }; php70 = generic { -- cgit 1.4.1 From ff5ef7d052a32bb98057362509f827fd665539f5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 20 Jan 2017 11:54:34 +0100 Subject: php70: 7.0.14 -> 7.0.15 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 651b22ff409b..d676e0c1b685 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -314,8 +314,8 @@ in { }; php70 = generic { - version = "7.0.14"; - sha256 = "0d0596vzpyw86a77smk799sxl4mh2wylzsvmrv8mzda21nd3di7v"; + version = "7.0.15"; + sha256 = "1nbxwj4yx30k77qibhmnx0rvqhia1zbkwi5ps5nzm0sn6d3zkj58"; }; php71 = generic { -- cgit 1.4.1 From e5acde0cf4975282cf26461e6d46db1e4ef90026 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 20 Jan 2017 11:54:44 +0100 Subject: php71: 7.1.0 -> 7.1.1 @NixOS/security-notifications (for all three updates) Relevant to #21967 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index d676e0c1b685..c261668edd26 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -319,7 +319,7 @@ in { }; php71 = generic { - version = "7.1.0"; - sha256 = "0qcf4aahkiwypidw42pd5dz34n10296zgjfyh56lgcymxryzvg38"; + version = "7.1.1"; + sha256 = "1g3mqscxnsic9ypf641jhiyn95d4d1nz198539245v2lgffx74fp"; }; } -- cgit 1.4.1 From 487f2cfef8b6a1b7b011d0a1af6244a0d28f877b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 21 Jan 2017 23:40:13 +0100 Subject: groovy: 2.4.7 -> 2.4.8 --- pkgs/development/interpreters/groovy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index a883080f58e7..b4a9282e1851 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.7"; + version = "2.4.8"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1mgvpqxc99057szfhhjfirmf3xyhs0vmgb0jzy47wr2jh84xd3a3"; + sha256 = "1zcdkarz9mbx9k5sl69nbphjjcy0xd15zjicjnhp2wq32zm6b2k6"; }; buildInputs = [ unzip makeWrapper ]; -- cgit 1.4.1 From cb30150bd5dd728e2cd9b9b2870cf6f3424d4261 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Jan 2017 18:00:48 +0100 Subject: php: fix build in case mysql is not mariadb fixes #20986 --- pkgs/development/interpreters/php/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index c261668edd26..b7777d55667c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -9,9 +9,10 @@ let generic = { version, sha256 }: - let php7 = lib.versionAtLeast version "7.0"; in + let php7 = lib.versionAtLeast version "7.0"; + mysqlHeaders = mysql.lib.dev or mysql; - composableDerivation.composableDerivation {} (fixed: { + in composableDerivation.composableDerivation {} (fixed: { inherit version; @@ -114,12 +115,12 @@ let mysql = { configureFlags = ["--with-mysql"]; - buildInputs = [ mysql.lib.dev ]; + buildInputs = [ mysqlHeaders ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql.lib.dev}/bin/mysql_config"]; - buildInputs = [ mysql.lib.dev ]; + configureFlags = ["--with-mysqli=${mysqlHeaders}/bin/mysql_config"]; + buildInputs = [ mysqlHeaders ]; }; mysqli_embedded = { @@ -129,8 +130,8 @@ let }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql.lib.dev}"]; - buildInputs = [ mysql.lib.dev ]; + configureFlags = ["--with-pdo-mysql=${mysqlHeaders}"]; + buildInputs = [ mysqlHeaders ]; }; bcmath = { -- cgit 1.4.1