Merge branch 'master.upstream' into staging.upstream
This commit is contained in:
William A. Kennington III
@@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.10.1";
|
||||
version = "6.11.2";
|
||||
name = "checkstyle-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
|
||||
sha256 = "18axx444hzi1gcbqa7nyifdvyqsiab0asya4qwa7y6khiq7y3myb";
|
||||
sha256 = "13ywwm24199c942w9ly2cvy6rjbs0sim50lrvjybc0sh6gbg44sc";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -5,22 +5,18 @@ stdenv.mkDerivation rec {
|
||||
version = "0.13.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar";
|
||||
sha256 = "04k411gcrq35ayd2xj79bcshczslyqkicwvhkf07hkyr4j3blxda";
|
||||
url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
|
||||
sha256 = "148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
patchPhase = ''
|
||||
echo -java-home ${jre.home} >>conf/sbtopts
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cat > $out/bin/sbt << EOF
|
||||
#! ${stdenv.shell}
|
||||
if [ ! -v JAVA_HOME ]; then
|
||||
export JAVA_HOME="${jre.home}"
|
||||
fi
|
||||
${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/sbt
|
||||
mkdir -p $out/share/sbt $out/bin
|
||||
cp -ra . $out/share/sbt
|
||||
ln -s $out/share/sbt/bin/sbt $out/bin/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jenkins-${version}";
|
||||
version = "1.631";
|
||||
version = "1.633";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
|
||||
sha256 = "0bfh5gv3yk9awkzf660jxf9vzzdcr6qa9hl0hkivaj4gmp5f9sp8";
|
||||
sha256 = "1s5jihq9shscsdazb1c393qab0djms4by5zn3ciylcgvif431n8m";
|
||||
};
|
||||
meta = with stdenv.lib; {
|
||||
description = "An extendable open source continuous integration server";
|
||||
|
||||
@@ -3,11 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="jq";
|
||||
version="1.4";
|
||||
version="1.5";
|
||||
name="${baseName}-${version}";
|
||||
hash="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r";
|
||||
url="http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz";
|
||||
sha256="17dk17h7qj6xpnsbc09qwsqkm6r7jhqbfkjvwq246yxmpsx4334r";
|
||||
url="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz";
|
||||
sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
|
||||
};
|
||||
buildInputs = [
|
||||
];
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{stdenv, fetchurl, tex}:
|
||||
|
||||
stdenv.mkDerivation rec{
|
||||
|
||||
name = "nuweb-${version}";
|
||||
version = "1.58";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.sourceforge.net/project/nuweb/${name}.tar.gz";
|
||||
sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
|
||||
};
|
||||
|
||||
buildInputs = [ tex ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -ie 's|nuweb -r|./nuweb -r|' Makefile
|
||||
'';
|
||||
buildPhase = ''
|
||||
make nuweb
|
||||
make nuweb.pdf nuwebdoc.pdf all
|
||||
'';
|
||||
installPhase = ''
|
||||
install -d $out/bin $out/share/man/man1 $out/share/doc/${name} $out/share/emacs/site-lisp
|
||||
cp nuweb $out/bin
|
||||
cp nuweb.el $out/share/emacs/site-lisp
|
||||
gzip -c nuweb.1 > $out/share/man/man1/nuweb.1.gz
|
||||
cp htdocs/index.html nuweb.w nuweb.pdf nuwebdoc.pdf README $out/share/doc/${name}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A simple literate programming tool";
|
||||
homepage = http://nuweb.sourceforge.net;
|
||||
license = licenses.free;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
};
|
||||
}
|
||||
# TODO: nuweb.el Emacs integration
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
name = "ccache-${version}";
|
||||
version = "3.2.3";
|
||||
sha256 = "03k0fvblwqb80zwdgas8a5fjrwvghgsn587wp3lfr0jr8gy1817c";
|
||||
version = "3.2.4";
|
||||
sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w";
|
||||
|
||||
ccache =
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.elastic.co/kibana/kibana-snapshot/kibana-4.2.0-snapshot-linux-x86.tar.gz";
|
||||
sha256 = "1sa92laawxc05abiysvp12v5nzrqggmls592mkprwnbkkkbwsm5x";
|
||||
url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz";
|
||||
sha256 = "00ag4wnlw6h2j6zcz0irz6j1s51fr9ix2g1smrhrdw44z5gb6wrh";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
{stdenv, fetchurl, zlib, ocaml, findlib, ncurses
|
||||
, versionedDerivation, unzip
|
||||
, version ?
|
||||
let match = {
|
||||
"ocaml-3.10.0" = "for-3.10.0";
|
||||
"ocaml-3.12.1" = "for-3.12.1";
|
||||
}; in stdenv.lib.maybeAttr ocaml.name (throw "no matching source of ocaml-deriving for ocaml version: ${ocaml.name}") match
|
||||
}:
|
||||
|
||||
/*
|
||||
Usage example:
|
||||
|
||||
== main.ml ==
|
||||
type t = | A | B
|
||||
deriving (Show)
|
||||
|
||||
print_string (Show.show<t> (A));;
|
||||
==
|
||||
|
||||
ocamlopt -pp $out/bin/deriving -I $d/lib -I $d/syntax nums.cmxa show.cmx main.ml
|
||||
*/
|
||||
|
||||
versionedDerivation "ocaml-deriving" version {
|
||||
|
||||
"for-3.10.0" = {
|
||||
name = "deriving-0.1.1a";
|
||||
# ocaml: 3.10.0
|
||||
src = fetchurl {
|
||||
url = https://deriving.googlecode.com/files/deriving-0.1.1a.tar.gz;
|
||||
sha256 = "0ppmqhc23kccfjn3cnd9n205ky627ni8f5djf8sppmc3lc1m97mb";
|
||||
};
|
||||
};
|
||||
|
||||
"for-3.12.1" = {
|
||||
name = "deriving-git20100903";
|
||||
|
||||
# https://github.com/jaked/deriving
|
||||
src = fetchurl {
|
||||
name = "for-3.12.0.zip";
|
||||
url = https://codeload.github.com/jaked/deriving/zip/c7b9cea3eb4bbfb9e09673faf725f70247c9df78;
|
||||
sha256 = "1zrmpqb5lsjmizqs68czmfpsbz9hz30pf97w11kkby175hhj84gi";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
};
|
||||
|
||||
}
|
||||
{
|
||||
buildInputs = [ocaml findlib];
|
||||
|
||||
installPhase = ''
|
||||
# not all tests compile !?
|
||||
# (cd tests; make)
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -a lib $out/
|
||||
cp -a syntax $out
|
||||
|
||||
# this allows -pp deriving
|
||||
ln -s $out/syntax/deriving $out/bin/deriving
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://code.google.com/p/deriving/source/checkout";
|
||||
description = "A library of cryptographic primitives for OCaml";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = ocaml.meta.platforms;
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.z77z
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -8,3 +8,14 @@
|
||||
|
||||
####
|
||||
|
||||
--- old/Makefile 2014-09-30 16:40:37.000000000 +0200
|
||||
+++ new/Makefile 2015-10-14 10:28:41.366815864 +0200
|
||||
@@ -52,7 +52,7 @@
|
||||
install-bin:
|
||||
install -d -m 755 $(BINDIR)
|
||||
install $(BIN) $(BINDIR)
|
||||
- install $(TOOLS) $(BINDIR)
|
||||
+ install $(TOOLS) $(BINDIR) || true
|
||||
|
||||
uninstall: uninstall-lib uninstall-bin
|
||||
|
||||
|
||||
@@ -1,23 +1,25 @@
|
||||
{ stdenv, fetchurl, ocaml, findlib, ocpBuild, opam, cmdliner }:
|
||||
{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
|
||||
|
||||
let inherit (stdenv.lib) getVersion versionAtLeast; in
|
||||
|
||||
assert versionAtLeast (getVersion ocaml) "3.12.1";
|
||||
assert versionAtLeast (getVersion ocpBuild) "1.99.3-beta";
|
||||
assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "ocp-indent-1.4.2b";
|
||||
name = "ocp-indent-1.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OCamlPro/ocp-indent/archive/1.4.2b.tar.gz";
|
||||
sha256 = "1p0n2zcl5kf543x2xlqrz1aa51f0dqal8l392sa41j6wx82j0gpb";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz";
|
||||
sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocpBuild opam cmdliner ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
preConfigure = "patchShebangs ./install.sh";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
|
||||
'';
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
let inherit (stdenv.lib) getVersion versionAtLeast optional; in
|
||||
|
||||
assert versionAtLeast (getVersion ocaml) "3.12.1";
|
||||
assert versionAtLeast (getVersion ocaml) "4";
|
||||
assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
|
||||
assert versionAtLeast (getVersion ocpIndent) "1.4.2";
|
||||
|
||||
|
||||
@@ -1,21 +1,22 @@
|
||||
{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig
|
||||
{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders
|
||||
, withGUI ? false , qt4 ? null}:
|
||||
|
||||
# libX11 is needed because the Qt build stuff automatically adds `-lX11'.
|
||||
assert withGUI -> qt4 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "oprofile-1.0.0";
|
||||
name = "oprofile-1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/oprofile/${name}.tar.gz";
|
||||
sha256 = "0nn4wfvwy4nii25y6lwlrnzx9ah4nz0r93yk7hswiy6wxjs10wc4";
|
||||
sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg";
|
||||
};
|
||||
|
||||
buildInputs = [ binutils zlib popt pkgconfig ]
|
||||
buildInputs = [ binutils zlib popt pkgconfig linuxHeaders ]
|
||||
++ stdenv.lib.optionals withGUI [ qt4 ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-kernel=${linuxHeaders}"
|
||||
"--disable-shared" # needed because only the static libbfd is available
|
||||
]
|
||||
++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
||||
echo 'export SLIMERJSLAUNCHER=${firefox}/bin/firefox' >> "$out/bin/slimerjs"
|
||||
echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs"
|
||||
chmod a+x "$out/bin/slimerjs"
|
||||
sed -e 's@MaxVersion=3[0-9][.]@MaxVersion=40.@' -i "$out/lib/slimerjs/application.ini"
|
||||
sed -e 's@MaxVersion=[34][0-9][.]@MaxVersion=50.@' -i "$out/lib/slimerjs/application.ini"
|
||||
'';
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
|
||||
Reference in New Issue
Block a user