Merge pull request #7529 from joachifm/trivial-builderDefs
Some trivial builderDefs->mkDerivation translations
This commit is contained in:
Pascal Wittmann
commit
8e86ec5bf0
@ -1,50 +1,27 @@
|
||||
x@{builderDefsPackage
|
||||
, jre, unzip
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
[];
|
||||
{ stdenv, fetchurl, jre }:
|
||||
|
||||
buildInputs = map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="vue";
|
||||
version="3.2.2";
|
||||
name="${baseName}-${version}";
|
||||
url="releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2";
|
||||
hash="0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
src = a.fetchurl {
|
||||
url = sourceInfo.url;
|
||||
sha256 = sourceInfo.hash;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vue-${version}";
|
||||
version = "3.2.2";
|
||||
src = fetchurl {
|
||||
url = "releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2";
|
||||
sha256 = "0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld";
|
||||
};
|
||||
|
||||
inherit (sourceInfo) name version;
|
||||
inherit buildInputs;
|
||||
phases = "installPhase";
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doDeploy"];
|
||||
|
||||
doDeploy = a.fullDepEntry ''
|
||||
installPhase = ''
|
||||
mkdir -p "$out"/{share/vue,bin}
|
||||
cp ${src} "$out/share/vue/vue.jar"
|
||||
echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
|
||||
echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
|
||||
echo '#!${stdenv.shell}' >> "$out/bin/vue"
|
||||
echo '${jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
|
||||
chmod a+x "$out/bin/vue"
|
||||
'' ["addInputs" "defEnsureDir"];
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Visual Understanding Environment - mind mapping software";
|
||||
maintainers = with a.lib.maintainers;
|
||||
[
|
||||
raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
license = a.lib.licenses.free; # Apache License fork, actually
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = stdenv.lib.licenses.free; # Apache License fork, actually
|
||||
};
|
||||
}) x
|
||||
}
|
||||
|
||||
@ -1,37 +1,28 @@
|
||||
{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11, boost, zlib }:
|
||||
{ stdenv, fetchurl, scons, pkgconfig, gtk, bzip2, libglade, openssl
|
||||
, libX11, boost, zlib, libnotify }:
|
||||
|
||||
with builderDefs;
|
||||
let localDefs = builderDefs.passthru.function ((rec {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2;
|
||||
sha256 = "66012740e9347a2e994c8af5609c40ebf3f86f767258e071a03ef39a2314298a";
|
||||
};
|
||||
|
||||
buildInputs = [scons pkgconfig gtk bzip2 libglade
|
||||
openssl libX11 boost];
|
||||
configureFlags = [];
|
||||
doScons = fullDepEntry (''
|
||||
mkdir -p $out
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
|
||||
|
||||
for i in gettext xgettext msgfmt msgcat; do
|
||||
echo > $i
|
||||
chmod a+x $i
|
||||
done
|
||||
export PATH=$PATH:$PWD
|
||||
|
||||
scons PREFIX=$out
|
||||
scons PREFIX=$out install
|
||||
'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
|
||||
}));
|
||||
in with localDefs;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ldcpp-1.1.0";
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure localDefs
|
||||
[doScons doForceShare doPropagate]);
|
||||
src = fetchurl {
|
||||
url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2;
|
||||
sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6";
|
||||
};
|
||||
buildInputs = [ scons pkgconfig gtk bzip2 libglade openssl libX11 boost libnotify ];
|
||||
|
||||
installPhase = ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
|
||||
|
||||
touch gettext xgettext msgfmt msgcat
|
||||
chmod +x gettext xgettext msgfmt msgcat
|
||||
export PATH=$PATH:$PWD
|
||||
|
||||
mkdir -p $out
|
||||
scons PREFIX=$out
|
||||
scons PREFIX=$out install
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Linux DC++ - Direct Connect client";
|
||||
description = "Direct Connect client";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,38 +1,28 @@
|
||||
a :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
{ stdenv, fetchcvs }:
|
||||
|
||||
version = a.lib.attrByPath ["version"] "2009-05-27" a;
|
||||
buildInputs = with a; [
|
||||
|
||||
];
|
||||
in
|
||||
rec {
|
||||
src = a.fetchcvs {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libffcall-${version}";
|
||||
version = "2009-05-27";
|
||||
src = fetchcvs {
|
||||
cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall";
|
||||
module = "ffcall";
|
||||
date = version;
|
||||
sha256 = "91bcb5a20c85a9ccab45886aae8fdbbcf1f20f995ef898e8bdd2964448daf724";
|
||||
sha256 = "097pv94495njppl9iy2yk47z5wdwvf7swsl88nmwrac51jibbg4i";
|
||||
};
|
||||
|
||||
inherit buildInputs;
|
||||
configureFlags = [];
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doConfigure" "doMakeInstall"];
|
||||
|
||||
doConfigure = a.fullDepEntry (''
|
||||
configurePhase = ''
|
||||
for i in ./configure */configure; do
|
||||
cwd="$PWD"
|
||||
cd "$(dirname "$i")";
|
||||
cd "$(dirname "$i")";
|
||||
( test -f Makefile && make distclean ) || true
|
||||
./configure --prefix=$out
|
||||
cd "$cwd"
|
||||
done
|
||||
'') a.doConfigure.deps;
|
||||
'';
|
||||
|
||||
name = "libffcall-" + version;
|
||||
meta = {
|
||||
description = "Foreign function call library";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,47 +1,20 @@
|
||||
x@{builderDefsPackage
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
[];
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
buildInputs = map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="ioping";
|
||||
version = "0.9";
|
||||
name="${baseName}-${version}";
|
||||
url="https://docs.google.com/uc?id=0B_PlDc2qaehFWWtLZ3Z3N1ltdm8&export=download";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
src = a.fetchurl {
|
||||
url = sourceInfo.url;
|
||||
name = "${sourceInfo.name}.tar.gz";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ioping-${version}";
|
||||
version = "0.9";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/koct9i/ioping/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "0pbp7b3304y9yyv2w41l3898h5q8w77hnnnq1vz8qz4qfl4467lm";
|
||||
};
|
||||
|
||||
inherit (sourceInfo) name version;
|
||||
inherit buildInputs;
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doMakeInstall"];
|
||||
makeFlags = [
|
||||
''PREFIX="$out"''
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Filesystem IO delay time measurer";
|
||||
maintainers = with a.lib.maintainers;
|
||||
[
|
||||
raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
license = a.lib.licenses.gpl3Plus;
|
||||
homepage = "http://code.google.com/p/ioping/";
|
||||
inherit version;
|
||||
meta = with stdenv.lib; {
|
||||
description = "Disk I/O latency measuring tool";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = with platforms; unix;
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = https://github.com/koct9i/ioping;
|
||||
};
|
||||
}) x
|
||||
|
||||
}
|
||||
|
||||
@ -6475,9 +6475,7 @@ let
|
||||
|
||||
libfixposix = callPackage ../development/libraries/libfixposix {};
|
||||
|
||||
libffcall = builderDefsPackage (import ../development/libraries/libffcall) {
|
||||
inherit fetchcvs;
|
||||
};
|
||||
libffcall = callPackage ../development/libraries/libffcall { };
|
||||
|
||||
libffi = callPackage ../development/libraries/libffi { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user