Merge branch 'master'
This commit is contained in:
Vladimír Čunát
@@ -3,11 +3,11 @@
|
||||
sbcl }:
|
||||
|
||||
let hashes = {
|
||||
"7.4" = "04jb789nks9llwysxz1zw9pq1dh0j39b5fcmivcc4bq9v9cga2l1";
|
||||
"8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "acl2-${version}";
|
||||
version = "7.4";
|
||||
version = "8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acl2-devel";
|
||||
|
||||
@@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="angelscript";
|
||||
version = "2.31.2";
|
||||
version = "2.32.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
|
||||
sha256 = "1cl1yg36ad4wq0vks4xg0hv7iyvq6yzsd4y1jng5qdf8qybq02qc";
|
||||
sha256 = "0675hza06v3grxyqfy70gzm57idmbbm7qvi6bg5vf8m6mpw757dl";
|
||||
};
|
||||
buildInputs = [
|
||||
unzip
|
||||
|
||||
18
pkgs/development/interpreters/dhall/default.nix
Normal file
18
pkgs/development/interpreters/dhall/default.nix
Normal file
@@ -0,0 +1,18 @@
|
||||
{ haskell, haskellPackages, stdenvNoCC }:
|
||||
|
||||
let
|
||||
static = haskell.lib.justStaticExecutables haskellPackages.dhall;
|
||||
|
||||
in static.overrideAttrs (old: {
|
||||
passthru = old.passthru or {} // {
|
||||
prelude = stdenvNoCC.mkDerivation {
|
||||
name = "dhall-prelude";
|
||||
inherit (old) src;
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r Prelude/* $out/
|
||||
'';
|
||||
};
|
||||
};
|
||||
})
|
||||
@@ -1,7 +1,7 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "1.6.0";
|
||||
sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx";
|
||||
version = "1.6.2";
|
||||
sha256 = "18f5afmvra78y0x73bfnwbddlyqfndyaj1h8n1ybj32w4nvy96y7";
|
||||
minimumOTPVersion = "18";
|
||||
}
|
||||
|
||||
@@ -2,15 +2,21 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "hy-${version}";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/h/hy/${name}.tar.gz";
|
||||
sha256 = "1fjip998k336r26i1gpri18syvfjg7z46wng1n58dmc238wm53sx";
|
||||
sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ];
|
||||
|
||||
# The build generates a .json parser file in the home directory under .cache.
|
||||
# This is needed to get it to not try and open files in /homeless-shelter
|
||||
preConfigure = ''
|
||||
export HOME=$TMP
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A LISP dialect embedded in Python";
|
||||
homepage = http://hylang.org/;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "joker-${version}";
|
||||
version = "0.8.7";
|
||||
version = "0.8.9";
|
||||
|
||||
goPackagePath = "github.com/candid82/joker";
|
||||
|
||||
@@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "1cmvja8qdrrzacdfn944f22mdg8177qkxfrb10ykq59c2yp1xn01";
|
||||
sha256 = "0ph5f3vc6x1qfh3zn3va2xqx3axv1i2ywbhxayk58p55fxblj5c9";
|
||||
};
|
||||
|
||||
preBuild = "go generate ./...";
|
||||
|
||||
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
|
||||
jruby = stdenv.mkDerivation rec {
|
||||
name = "jruby-${version}";
|
||||
|
||||
version = "9.1.13.0";
|
||||
version = "9.1.16.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
|
||||
sha256 = "021rmm5c18js569i4z6vj1bb193j4nska43jfiqz5hisc936c5cx";
|
||||
sha256 = "0nj8v4dcg4jj0z3fk661v6mzrgg4613xr0k9xzzsz81jkqsjnb6r";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc }:
|
||||
{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc, fetchpatch }:
|
||||
|
||||
with lib;
|
||||
|
||||
@@ -133,10 +133,19 @@ let
|
||||
sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ buildPackages.stdenv.cc ];
|
||||
# https://github.com/arsv/perl-cross/issues/60
|
||||
perl-cross-gcc7-patch = fetchpatch {
|
||||
url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch";
|
||||
sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
postUnpack = ''
|
||||
unpackFile ${perl-cross-src}
|
||||
cd perl-cross-*
|
||||
patch -Np1 -i ${perl-cross-gcc7-patch}
|
||||
cd ..
|
||||
cp -R perl-cross-${crossVersion}/* perl-${version}/
|
||||
'';
|
||||
|
||||
|
||||
@@ -319,7 +319,7 @@ let
|
||||
description = "An HTML-embedded scripting language";
|
||||
homepage = http://www.php.net/;
|
||||
license = licenses.php301;
|
||||
maintainers = with maintainers; [ globin ];
|
||||
maintainers = with maintainers; [ globin etu ];
|
||||
platforms = platforms.all;
|
||||
outputsToInstall = [ "out" "dev" ];
|
||||
};
|
||||
@@ -338,22 +338,22 @@ let
|
||||
|
||||
in {
|
||||
php56 = generic {
|
||||
version = "5.6.33";
|
||||
sha256 = "1k1ip1slk89hkp57qiqp8k2m5yrg9lx5rja542g87k8xfslrdxh7";
|
||||
version = "5.6.34";
|
||||
sha256 = "1kgjgkabhrm8ksmh6j3m59vm85n401mcn7inh03hnjzfijflk7z1";
|
||||
};
|
||||
|
||||
php70 = generic {
|
||||
version = "7.0.27";
|
||||
sha256 = "0ca174kp2l3fjcp8z0mqnkbjfhijjzz7rs7bkzg1qk2cpdijbylr";
|
||||
version = "7.0.28";
|
||||
sha256 = "0zrw0saqlfv60f3nmff7288wqfhdsfiqns4ys3ii0drzc6s92m5f";
|
||||
};
|
||||
|
||||
php71 = generic {
|
||||
version = "7.1.14";
|
||||
sha256 = "1x41qmq66r0ff0573ln34d3qbzwg5z20nagsn1b6frfpkq9zvck3";
|
||||
version = "7.1.15";
|
||||
sha256 = "1gfw3ab9pvv034l9xk7ry23xsdz9vcwksrvmzkjmsj79713sa5z1";
|
||||
};
|
||||
|
||||
php72 = generic {
|
||||
version = "7.2.2";
|
||||
sha256 = "1vjaixm4f7rz9vz1yrlzmn9rpp01vd7b74m83qjg4wblw5caqhgq";
|
||||
version = "7.2.3";
|
||||
sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,61 +1,52 @@
|
||||
{ stdenv, fetchurl, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
|
||||
{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "52.2.1gnome1";
|
||||
let
|
||||
version = "52.6.0";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "spidermonkey-${version}";
|
||||
|
||||
# the release notes point to some guys home directory, see
|
||||
# https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
|
||||
# probably it would be more ideal to pull a particular tag/revision
|
||||
# from the mercurial repo
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-${version}.tar.gz";
|
||||
sha256 = "1bxhz724s1ch1c0kdlzlg9ylhg1mk8kbhdgfkax53fyvn51pjs9i";
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q";
|
||||
};
|
||||
|
||||
buildInputs = [ readline icu zlib nspr ];
|
||||
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
|
||||
patches = [
|
||||
# needed to build gnome3.gjs
|
||||
(fetchpatch {
|
||||
name = "mozjs52-disable-mozglue.patch";
|
||||
url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be;
|
||||
sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export CXXFLAGS="-fpermissive"
|
||||
export LIBXUL_DIST=$out
|
||||
export PYTHON="${python2.interpreter}"
|
||||
|
||||
cd js/src
|
||||
|
||||
autoconf
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-threadsafe"
|
||||
"--with-system-nspr"
|
||||
"--with-system-zlib"
|
||||
"--with-system-icu"
|
||||
"--with-intl-api"
|
||||
"--enable-readline"
|
||||
|
||||
# enabling these because they're wanted by 0ad. They may or may
|
||||
# not be good defaults for other uses.
|
||||
"--enable-gcgenerational"
|
||||
"--enable-shared-js"
|
||||
];
|
||||
|
||||
# This addresses some build system bug. It's quite likely to be safe
|
||||
# to re-enable parallel builds if the source revision changes.
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postFixup = ''
|
||||
# The headers are symlinks to a directory that doesn't get put
|
||||
# into $out, so they end up broken. Fix that by just resolving the
|
||||
# symlinks.
|
||||
for i in $(find $out -type l); do
|
||||
cp --remove-destination "$(readlink "$i")" "$i";
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Mozilla's JavaScript engine written in C/C++";
|
||||
homepage = https://developer.mozilla.org/en/SpiderMonkey;
|
||||
# TODO: MPL/GPL/LGPL tri-license.
|
||||
|
||||
license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
|
||||
maintainers = [ maintainers.abbradar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@@ -9,12 +9,12 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "supercollider-${version}";
|
||||
version = "3.8.1";
|
||||
version = "3.9.1";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2";
|
||||
sha256 = "1y8yb20k3lvj7c93qz2srrkvfv175n4n7p3qj89w0dp085mj0qmw";
|
||||
sha256 = "150fgnjcmb06r3pa3mbsvb4iwnqlimjwdxgbs6p55zz6g8wbln7a";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "stackprotector" ];
|
||||
|
||||
Reference in New Issue
Block a user