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

Merge branch 'master' into staging.

Browse Source
This commit is contained in:
Peter Simons
2015-03-02 21:10:36 +01:00
parent a24ef4f338 c97d7819ab
commit 5341196f01
128 changed files with 2170 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
pkgs/development/compilers/cudatoolkit/6.5.nix Normal file
View File

@@ -0,0 +1,65 @@
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
}:
let version = "6.5.19"; in
stdenv.mkDerivation rec {
name = "cudatoolkit-${version}";
dontPatchELF = true;
dontStrip = true;
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_${version}_linux_64.run";
sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
}
else throw "cudatoolkit does not support platform ${stdenv.system}";
outputs = [ "out" "sdk" ];
buildInputs = [ perl ];
runtimeDependencies = [
ncurses expat python zlib
xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
gtk2 glib fontconfig freetype unixODBC alsaLib
];
rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64";
unpackPhase = ''
sh $src --keep --noexec
cd pkg/run_files
sh cuda-linux64-rel-${version}-*.run --keep --noexec
sh cuda-samples-linux-${version}-*.run --keep --noexec
cd pkg
'';
buildPhase = ''
find . -type f -executable -exec patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
'{}' \; || true
find . -type f -exec patchelf \
--set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
--force-rpath \
'{}' \; || true
'';
installPhase = ''
mkdir $out $sdk
perl ./install-linux.pl --prefix="$out"
rm $out/tools/CUDA_Occupancy_Calculator.xls
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
mv $out/include $out/usr_include
'';
setupHook = ./setup-hook.sh;
meta = {
license = lib.licenses.unfree;
};
}

4
pkgs/development/compilers/nasm/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "nasm-${version}";
version = "2.11.05"; # do not update until syslinux is fixed with that version
version = "2.11.08";
src = fetchurl {
url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa";
sha256 = "0ialkla6i63j8fpv840jy7k5mdf2wbqr98bvbcq0dp0b38ls18wx";
};
meta = with stdenv.lib; {

6
pkgs/development/coq-modules/contribs/all.nix
View File

@@ -47,7 +47,7 @@ EuclideanGeometry = "11n8877zksgksdfcj7arjx0zcfhsrvg83lcp6yb2bynvfp80gyzb";
EulerFormula = "1nhh49rf6wza2m5qmz5l5m24m299qn3v80wqzvf51lybadzll2h6";
ExactRealArithmetic = "1p32g13sx2z5rj3q6390ym8902gvl5x16wdhgz5i75y44s6kmkb1";
Exceptions = "0w2b16nr80f70dxllmhbqwfr1aw26rcfbak5bdyc0fna8hqp4q3p";
#FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6";
FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6";
FSSecModel = "0fi78vqfrw4vrmdw215ic08rw8y6aia901wqs4f1s9z2idd6m8qy";
FSets = "1n54s2vr6snh31jnvr79q951vyk0w0w6jrnwnlz9d3vyw47la9js";
Fairisle = "0gg9x69qr0zflaryniqnl8d34kjdij0i55fcb1f1i5hmrwn2sqn6";
@@ -135,10 +135,10 @@ RulerCompassGeometry = "02vm80xvvw22pdxrag3pv5zrhqf8726i9jqsiv4bnjqavj5z2hdr";
SMC = "0ca3ar1y9nyj5147r18babqsbg2q2ywws8fdi91xb5z9m3i97nv1";
Schroeder = "0mfbjmw4a48758k88yv01494wnywcp5yamkl394axvvbbna9h8b6";
SearchTrees = "1jyps6ddm8klmxjm50p2j9i014ij7imy3229pwz3dkzg54gxzzxb";
#Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580";
Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580";
Shuffle = "14v1m4s9k49w30xrnyncjzgqjcckiga8wd2vnnzy8axrwr9zq7iq";
SquareMatrices = "07dlykg3w59crc54qqdqxq6hf8rmzvwwfr1g8z8v2l8h4yvfnhfl";
Ssreflect = "1capfvkdnsv95ik0yj9kpwj4smm7i7n2n98d6rlv68bdd2abw9f3";
Ssreflect = "07hv0ixv68d8vrpf9s6gxazxaz5fwpmhqrd6cqw7xp8m8gspxifz";
Stalmarck = "0vcbkzappq1si4hxbnb9bjkfk82j3jklb8g8ia83h1mdhzr7xdpz";
Streams = "1spcqnvwayahk12fd13vzh922ypzrjkcmws9gcy12qdqp04h8bnc";
String = "1wy7g66yq9y8m8y3gq29q7whfdm98g3cj9jxm5yibdzfahfdzzni";

57
pkgs/development/coq-modules/contribs/default.nix
View File

@@ -4,6 +4,15 @@ let
mkContrib = import ./mk-contrib.nix;
all = import ./all.nix;
overrides = {
Additions = self: {
patchPhase = ''
for p in binary_strat dicho_strat generation log2_implementation shift
do
substituteInPlace $p.v \
--replace 'Require Import Euclid.' 'Require Import Coq.Arith.Euclid.'
done
'';
};
BDDs = self: {
buildInputs = self.buildInputs ++ [ contribs.IntMap ];
patchPhase = ''
@@ -13,6 +22,7 @@ let
32d30
< extraction
EOF
coq_makefile -f Make -o Makefile
'';
postInstall = ''
mkdir -p $out/bin
@@ -25,6 +35,7 @@ let
17d16
< rauzy/algorithme1/extraction
EOF
coq_makefile -f Make -o Makefile
'';
postInstall = ''
mkdir -p $out/bin
@@ -38,6 +49,7 @@ let
2d1
< -R ../QArithSternBrocot QArithSternBrocot
EOF
coq_makefile -f Make -o Makefile
'';
};
CoRN = self: {
@@ -47,7 +59,9 @@ let
2d1
< -R ../MathClasses/ MathClasses
EOF
coq_makefile -f Make -o Makefile.coq
'';
enableParallelBuilding = true;
installFlags = self.installFlags + " -f Makefile.coq";
};
Counting = self: {
@@ -70,6 +84,7 @@ let
< -I ../Counting/src
< -R ../Counting/theories Counting
EOF
coq_makefile -f Make -o Makefile
'';
};
FingerTree = self: {
@@ -78,6 +93,22 @@ let
21d20
< extraction
EOF
coq_makefile -f Make -o Makefile
'';
};
FOUnify = self: {
patchPhase = ''
patch Make <<EOF
8c8
< -custom "\$(CAMLOPTLINK) -pp '\$(CAMLBIN)\$(CAMLP4)o' -o unif unif.mli unif.ml main.ml" unif.ml unif
---
> -custom "\$(CAMLOPTLINK) -pp 'camlp5o' -o unif unif.mli unif.ml main.ml" unif.ml unif
EOF
coq_makefile -f Make -o Makefile
'';
postInstall = ''
mkdir -p $out/bin
cp unif $out/bin/
'';
};
Goedel = self: {
@@ -85,8 +116,9 @@ let
patchPhase = ''
patch Make <<EOF
2d1
< -R ../../Eindhoven/Pocklington Pocklington
< -R ../../Eindhoven/Pocklington Pocklington
EOF
coq_makefile -f Make -o Makefile
'';
};
Graphs = self: {
@@ -96,6 +128,7 @@ let
2d1
< -R ../../Cachan/IntMap IntMap
EOF
coq_makefile -f Make -o Makefile
'';
postInstall = ''
mkdir -p $out/bin
@@ -110,6 +143,7 @@ let
2d1
< -R ../../Sophia-Antipolis/Algebra/ Algebra
EOF
coq_makefile -f Make -o Makefile
'';
};
Markov = self: { configurePhase = "coq_makefile -o Makefile -R . Markov markov.v"; };
@@ -129,6 +163,7 @@ let
< -R ../../Sophia-Antipolis/Algebra Algebra
< -R ../../Nijmegen/LinAlg LinAlg
EOF
coq_makefile -f Make -o Makefile
'';
};
PTSF = self: {
@@ -138,6 +173,7 @@ let
1d0
< -R ../../Paris/PTSATR/ PTSATR
EOF
coq_makefile -f Make -o Makefile
'';
};
RelationExtraction = self: {
@@ -146,6 +182,20 @@ let
31d30
< test
EOF
coq_makefile -f Make -o Makefile
'';
};
Semantics = self: {
patchPhase = ''
patch Make <<EOF
18a19
> interp.mli
EOF
'';
configurePhase = ''
coq_makefile -f Make -o Makefile
make extract_interpret.vo
rm -f str_little.ml.d
'';
};
SMC = self: {
@@ -155,12 +205,13 @@ let
2d1
< -R ../../Cachan/IntMap IntMap
EOF
coq_makefile -f Make -o Makefile
'';
};
Ssreflect = self: {
patchPhase = ''
substituteInPlace Makefile \
--replace "/bin/mkdir" "mkdir"
--replace "/bin/mkdir" "mkdir"
'';
};
Stalmarck = self: {
@@ -173,6 +224,7 @@ let
2d1
< -R ../ZornsLemma ZornsLemma
EOF
coq_makefile -f Make -o Makefile
'';
};
TreeAutomata = self: {
@@ -182,6 +234,7 @@ let
2d1
< -R ../../Cachan/IntMap IntMap
EOF
coq_makefile -f Make -o Makefile
'';
};
};

2
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@@ -99,7 +99,7 @@ self: super: {
});
foldl = appendPatch super.foldl (pkgs.fetchpatch {
url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch";
sha256 = "15lfh54vhdp36197dp4xpb2mr3g49gz2xzl31cjir1fmcvjsbgjl";
sha256 = "0q4gs3xkazh644ff7qn2mp2q1nq3jq71x82g7iaacxclkiv0bphx";
});
persistent-template = appendPatch super.persistent-template (pkgs.fetchpatch {
url = "https://github.com/yesodweb/persistent/commit/4d34960bc421ec0aa353d69fbb3eb0c73585db97.patch";

86
pkgs/development/haskell-modules/hackage-packages.nix
View File

@@ -9908,8 +9908,8 @@ self: {
}:
mkDerivation {
pname = "MonadCompose";
version = "0.6.0.0";
sha256 = "05fvnkpq37a4ab97lcv460znnq86csivyz3v6cmq08mnvsjf6cpl";
version = "0.7.0.0";
sha256 = "1jy81fkqr3325j58qxajzdmy22ssds3v80ks8320f3ws7rgkdhrh";
buildDepends = [
base ghc-prim MaybeT mmorph monad-products mtl transformers
];
@@ -21147,8 +21147,8 @@ self: {
}:
mkDerivation {
pname = "aws-kinesis-client";
version = "0.3.0.0";
sha256 = "0rc2r8adw4j667iicncvf266mc65f1agj50q8x6hn1fm8pa8ssa7";
version = "0.3.0.1";
sha256 = "020vv9aaqfxpgrpviy0y6i0448rypr7rg5cvzbmn46n96jyww12w";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -27633,8 +27633,8 @@ self: {
}:
mkDerivation {
pname = "casadi-bindings";
version = "2.2.0.6";
sha256 = "1iasw1yvh5cm2b2lfhn7026rkil054fymal3n8p1kc0qm02zb4i5";
version = "2.2.0.7";
sha256 = "05xgsn9xgkckx7ip2qqy332miv6yl70avyzp7z5ww8lvn2v8q8ks";
buildDepends = [
base casadi-bindings-core casadi-bindings-internal cereal
containers linear vector
@@ -45658,6 +45658,18 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
"flexible-time" = callPackage
({ mkDerivation, base, bytestring, unix-time }:
mkDerivation {
pname = "flexible-time";
version = "0.1.0.3";
sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l";
buildDepends = [ base bytestring unix-time ];
homepage = "https://github.com/tattsun/flexible-time";
description = "simple extension of Data.UnixTime.";
license = stdenv.lib.licenses.mit;
}) {};
"flexible-unlit" = callPackage
({ mkDerivation, base, bytestring, text }:
mkDerivation {
@@ -49018,21 +49030,21 @@ self: {
}) {};
"ghcid" = callPackage
({ mkDerivation, base, cmdargs, containers, directory, extra
({ mkDerivation, ansi-terminal, base, cmdargs, directory, extra
, filepath, process, tasty, tasty-hunit, terminal-size, time
}:
mkDerivation {
pname = "ghcid";
version = "0.3.4";
sha256 = "1xapx3rlx9fsvs5idqyarassqbg8ifsar923pi9vsn29ipjp2kjq";
version = "0.3.5";
sha256 = "1ad5x1xvx5v00gj4gwlqz806mzigga4h8xx6ldqsndb8inz7hsrx";
isLibrary = true;
isExecutable = true;
buildDepends = [
base cmdargs containers directory extra filepath process
ansi-terminal base cmdargs directory extra filepath process
terminal-size time
];
testDepends = [
base cmdargs containers directory extra filepath process tasty
ansi-terminal base cmdargs directory extra filepath process tasty
tasty-hunit terminal-size time
];
homepage = "https://github.com/ndmitchell/ghcid#readme";
@@ -55727,8 +55739,8 @@ self: {
}:
mkDerivation {
pname = "haskell-docs";
version = "4.2.4";
sha256 = "061gj5g1hga8k93rzknpyi51srlqnzcagykb9mzv91m8vp9wlnrf";
version = "4.2.5";
sha256 = "09xagxs0br6781flp430syfn6yv36ri0y1yki8cakrn7ak722fq2";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -60939,18 +60951,19 @@ self: {
"hlint" = callPackage
({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
, directory, extra, filepath, haskell-src-exts, hscolour, process
, directory, extra, filepath, haskell-src-exts, process
, transformers, uniplate
}:
mkDerivation {
pname = "hlint";
version = "1.9.16";
sha256 = "11ykjslyr8sgpa1jpnv3vdzz0nxyrxw3mzcsdbidgzw7aphpzcb3";
editedCabalFile = "4e3f4397ef78f431aadf4644b37ec01d624dd14dd70fec81953a509546182b8a";
isLibrary = true;
isExecutable = true;
buildDepends = [
ansi-terminal base cmdargs containers cpphs directory extra
filepath haskell-src-exts hscolour process transformers uniplate
filepath haskell-src-exts process transformers uniplate
];
homepage = "http://community.haskell.org/~ndm/hlint/";
description = "Source code suggestions";
@@ -103198,8 +103211,8 @@ self: {
}:
mkDerivation {
pname = "shelly";
version = "1.6.1";
sha256 = "01j25pw9xywfmw3rgi756n1sdzlclwbhsj6dgwalsc8rbpwdbynv";
version = "1.6.1.1";
sha256 = "1yv29fjyxfqykg7l8r4la1j4kz3ixmklhw15ki2b9dgwsp7vzmfh";
buildDepends = [
async base bytestring containers directory enclosed-exceptions
exceptions lifted-async lifted-base monad-control mtl process
@@ -103955,8 +103968,8 @@ self: {
({ mkDerivation, base, process }:
mkDerivation {
pname = "simple-smt";
version = "0.5.3";
sha256 = "0m3ghgh2ip22808cyx1babfkpj6v0ii6lmnwgrk8adaj5aif9dfg";
version = "0.5.4";
sha256 = "153f0h0432rh3ff5cvsjcnwaq6ydiprs16ximp1rcamwzm0nl8hp";
buildDepends = [ base process ];
description = "A simple way to interact with an SMT solver process";
license = stdenv.lib.licenses.bsd3;
@@ -104728,11 +104741,11 @@ self: {
({ mkDerivation, base, linear, vector }:
mkDerivation {
pname = "smoothie";
version = "0.1.0.0";
sha256 = "1njg9lw3wc11q15yh4mi1hmfmr4891w59pdwxy782jgqlxanmbx7";
version = "0.1.0.1";
sha256 = "1gr36qbc1d6j3mhgpyxc08qkgk11kdpschvclh06jlcq3h2j62sy";
buildDepends = [ base linear vector ];
homepage = "https://github.com/phaazon/smoothie";
description = "Smooth curves via several spline and polynomials";
description = "Smooth curves via several splines and polynomials";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -106483,8 +106496,10 @@ self: {
}:
mkDerivation {
pname = "soxlib";
version = "0.0.1.1";
sha256 = "0bc4s74f2sw32j17pihpq0liyaysi4n5i2704ycn5agsgnc0n8xp";
version = "0.0.2";
sha256 = "1d82sqihmx3ymgyahbnjlzmam4pj4rwyp956p74fpl0gsmqphmr8";
isLibrary = true;
isExecutable = true;
buildDepends = [
base containers explicit-exception extensible-exceptions
sample-frame storablevector transformers utility-ht
@@ -119230,8 +119245,8 @@ self: {
}:
mkDerivation {
pname = "vcache";
version = "0.2.1";
sha256 = "1nhcz52fszwyk363hi3xd0k2rx950xbrfq8ifl4i9l9zh3s0p232";
version = "0.2.2";
sha256 = "1df4y09f25y0sj3qn9x62a4bzdjjrml4510hdf0jsmiimqqyq0ac";
buildDepends = [
base bytestring containers direct-murmur-hash easy-file filelock
lmdb random stm transformers
@@ -120832,6 +120847,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"wai-middleware-static-caching" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, containers
, cryptohash, directory, expiring-cache-map, filepath, http-types
, mtl, old-locale, text, time, unix, wai
}:
mkDerivation {
pname = "wai-middleware-static-caching";
version = "0.6.0.1";
sha256 = "0xj4r1fr1g0fybgsq65gxcvh5zn9hafvm0f73p6dnj6jhz6dryhk";
buildDepends = [
base base16-bytestring bytestring containers cryptohash directory
expiring-cache-map filepath http-types mtl old-locale text time
unix wai
];
homepage = "https://github.com/agrafix/wai-middleware-static";
description = "WAI middleware that serves requests to static files";
license = stdenv.lib.licenses.bsd3;
}) {};
"wai-middleware-throttle" = callPackage
({ mkDerivation, base, bytestring, haddock, hlint, hspec
, http-types, HUnit, network, process, regex-compat, stm, text

3
pkgs/development/interpreters/octave/default.nix
View File

@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
# there is a mysterious sh: command not found
doCheck = false;
enableParallelBuilding = true;
# problems on Hydra
enableParallelBuilding = false;
configureFlags = [ "--enable-readline" "--enable-dl" ];

2
pkgs/development/interpreters/ruby/bundix/Gemfile
View File

@@ -1,4 +1,4 @@
source "http://rubygems.org"
gem "bundix",
:git => "https://github.com/cstrahan/bundix.git",
:ref => "5df25b11b5b86e636754d54c2a8859c7c6ec78c7"
:ref => "v1.0.2"

7
pkgs/development/interpreters/ruby/bundix/Gemfile.lock
View File

@@ -1,10 +1,9 @@
GIT
remote: https://github.com/cstrahan/bundix.git
revision: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7
ref: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7
revision: e098b8c04087079c897aaf9542990e9fdd503bcf
ref: v1.0.2
specs:
bundix (0.1.0)
bundler (~> 1.7.9)
bundix (1.0.2)
thor (~> 0.19.1)
GEM

8
pkgs/development/interpreters/ruby/bundix/gemset.nix
View File

@@ -1,12 +1,12 @@
{
"bundix" = {
version = "0.1.0";
version = "1.0.2";
source = {
type = "git";
url = "https://github.com/cstrahan/bundix.git";
rev = "5df25b11b5b86e636754d54c2a8859c7c6ec78c7";
rev = "e098b8c04087079c897aaf9542990e9fdd503bcf";
sha256 = "0www8srjqlxy1pzn2b6himy5y768dni54m7rv67gj8yvx48vd803";
fetchSubmodules = false;
sha256 = "1iqx12y777v8gszggj25x0xcf6lzllx58lmv53x6zy3jmvfh4siv";
};
dependencies = [
"thor"
@@ -19,4 +19,4 @@
sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
};
};
}
}

4
pkgs/development/libraries/botan/unstable.nix
View File

@@ -2,7 +2,7 @@
callPackage ./generic.nix (args // {
baseVersion = "1.11";
revision = "13";
sha256 = "1jg36k376w6d6g7hgs2d67sr84pail5qf6yy1s5ys7pc16k2dy41";
revision = "10";
sha256 = "06d5p0bs953r2pqfc635x2w78m3xv28gr6fmvd8whbk9qp8r91yb";
openssl = null;
})

5
pkgs/development/libraries/java/smack/builder.sh
View File

@@ -1,6 +1,7 @@
source $stdenv/setup
mkdir smack
cd smack
tar xfvz $src
cd smack*
mkdir -p $out/share/java
cp *.jar $out/share/java
cp smack-*.jar $out/share/java

8
pkgs/development/libraries/java/smack/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "smack-3_2_1";
name = "smack-3.4.1";
builder = ./builder.sh;
src = fetchurl {
url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_2_1.tar.gz;
sha256 = "0lljrxky66gc73caaflia2wgmlpry2cdj00bz1gd1vqrzd3pg3gd";
};
url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_4_1.tar.gz;
sha256 = "13jm93b0dsfxr62brq1hagi9fqk7ip3pi80svq10zh5kcpk77jf4";
};
}

22
pkgs/development/libraries/libctemplate/2.2.nix Normal file
View File

@@ -0,0 +1,22 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
meta = {
description = "A simple but powerful template language for C++";
longDescription = ''
CTemplate is a simple but powerful template language for C++. It
emphasizes separating logic from presentation: it is impossible to
embed application logic in this template language. '';
homepage = http://code.google.com/p/google-ctemplate/;
license = "bsd";
};
pname = "ctemplate";
version = "2.2";
name = "${pname}-${version}";
src = fetchurl {
url = "http://ctemplate.googlecode.com/files/${name}.tar.gz";
sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4";
};
}

17
pkgs/development/libraries/lirc/default.nix
View File

@@ -1,23 +1,20 @@
{ stdenv, fetchurl, alsaLib, bash, help2man }:
{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3 }:
stdenv.mkDerivation rec {
name = "lirc-0.9.1a";
name = "lirc-0.9.2a";
src = fetchurl {
url = "mirror://sourceforge/lirc/${name}.tar.bz2";
sha256 = "191vhgsds221rzpzjibj005pfr182hq65hniqfd0qqsl5h1zwq8r";
sha256 = "011nwpxm5d12rsapljg3pjf9pgb0j8ngmc3zg69q4kv61hkx2zim";
};
patches = [
(fetchurl {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lirc-0.9.1a-fix-segfaults.patch?h=packages/lirc";
sha256 = "00ainq7y8yh2r447968jid06cqfb1xirv24xxrkl0gvakrrv9gnh";
})
];
patchPhase = ''
sed -e 's|^#!/usr/bin/env python3$|#!${python3}/bin/python3|g' -i tools/*.py
'';
preBuild = "patchShebangs .";
buildInputs = [ alsaLib help2man ];
buildInputs = [ alsaLib help2man pkgconfig x11 python3 ];
configureFlags = [
"--with-driver=devinput"

4
pkgs/development/libraries/openssl/default.nix
View File

@@ -2,7 +2,7 @@
, withCryptodev ? false, cryptodevHeaders }:
let
name = "openssl-1.0.1k";
name = "openssl-1.0.1l";
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null)
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
"http://www.openssl.org/source/${name}.tar.gz"
"http://openssl.linux-mirror.org/source/${name}.tar.gz"
];
sha256 = "0754wzmzr90hiiqs5cy6g3cf8as75ljkhppgyirfg26hpapax7wg";
sha256 = "1m6i80y9c9g7h4303bqbxnsk5wm6jd0n57hwqr0g4jaxzr44vkxj";
};
patches = patchesCross false;

24
pkgs/development/libraries/science/math/openblas/default.nix
View File

@@ -1,5 +1,15 @@
{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
# Minimum CPU requirements:
# x86: Pentium 4 (Prescott, circa 2004)
# x86_64: Opteron (circa 2003)
# These are the settings used for the generic builds. Performance will
# be poor on modern systems. The goal of the Hydra builds is simply to
# support as many systems as possible. OpenBLAS may support older
# CPU architectures, but you will need to set 'config.openblas.target'
# and 'config.openblas.preferLocalBuild', which will build it on your
# local machine.
let local = config.openblas.preferLocalBuild or false;
localTarget = config.openblas.target or "";
in
@@ -20,18 +30,24 @@ stdenv.mkDerivation rec {
cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
target = if local then localTarget else
if cpu == "i686" then "P2" else
if cpu == "x86_64" then "CORE2" else
if cpu == "i686" then "PRESCOTT" else
if cpu == "x86_64" then "OPTERON" else
# allow autodetect
"";
makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
makeFlags = [
"${if target != "" then "TARGET=" else ""}${target}"
"FC=gfortran"
"CC=gcc"
''PREFIX="''$(out)"''
"INTERFACE64=1"
];
meta = with stdenv.lib; {
description = "Basic Linear Algebra Subprograms";
license = licenses.bsd3;
homepage = "https://github.com/xianyi/OpenBLAS";
platforms = [ "x86_64-linux" ];
platforms = with platforms; linux;
maintainers = with maintainers; [ ttuegel ];
};
}

27
pkgs/development/ocaml-modules/asn1-combinators/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
let version = "0.1.1"; in
stdenv.mkDerivation {
name = "ocaml-asn1-combinators-${version}";
src = fetchzip {
url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz";
sha256 = "1wl5g2cqd4dk33w0ski6z425cs4sgj980fw0xkwgz1w1xzywh4i2";
};
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ cstruct zarith ];
createFindlibDestdir = true;
meta = {
homepage = https://github.com/mirleft/ocaml-asn1-combinators;
description = "Combinators for expressing ASN.1 grammars in OCaml";
platforms = ocaml.meta.platforms;
license = stdenv.lib.licenses.bsd2;
maintainers = with stdenv.lib.maintainers; [ vbgl ];
};
}

33
pkgs/development/ocaml-modules/erm_xmpp/default.nix Normal file
View File

@@ -0,0 +1,33 @@
{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }:
let
version = "0.2";
disable-tests = fetchurl {
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/erm_xmpp/erm_xmpp.0.2/files/disable_tests.patch;
sha256 = "09d8630nmx2x8kb8ap1zmsb93zs14cqg7ga1gmdl92jvsjxbhgc1";
};
in
stdenv.mkDerivation {
name = "ocaml-erm_xmpp-${version}";
src = fetchzip {
url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz";
sha256 = "0saw2dmrzv2aadrznvyvchnhivvcwm78x9nwf6flq5v0pqddapk2";
};
patches = [ disable-tests ];
buildInputs = [ ocaml findlib camlp4 ];
propagatedBuildInputs = [ erm_xml cryptokit ];
createFindlibDestdir = true;
meta = {
homepage = https://github.com/ermine/xmpp;
description = "OCaml based XMPP implementation";
platforms = ocaml.meta.platforms;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ vbgl ];
};
}

24
pkgs/development/ocaml-modules/io-page/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ stdenv, fetchzip, ocaml, findlib, cstruct }:
let version = "1.4.0"; in
stdenv.mkDerivation {
name = "ocaml-io-page-${version}";
src = fetchzip {
url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz";
sha256 = "05m1gbcy72i6gikdijbkpw8pfygc86a3l4k8ayyl58019l6qa2fq";
};
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ cstruct ];
createFindlibDestdir = true;
meta = {
homepage = https://github.com/mirage/io-page;
platforms = ocaml.meta.platforms;
description = "IO memory page library for Mirage backends";
maintainers = with stdenv.lib.maintainers; [ vbgl ];
};
}

25
pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
View File

@@ -1,30 +1,25 @@
{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp, camlp4}:
{ stdenv, fetchzip, ocaml, findlib, oasis, ocaml_optcomp, camlp4 }:
let version = "0.7"; in
stdenv.mkDerivation {
name = "ocsigen-deriving";
src = fetchgit {
url = "git://github.com/ocsigen/deriving";
rev = "refs/tags/0.6.2";
sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662";
name = "ocsigen-deriving-${version}";
src = fetchzip {
url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";
sha256 = "05z606gly1iyan292x3mflg3zasgg68n8i2mivz0zbshx2hz2jbw";
};
buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp camlp4];
configurePhase = ''
make setup-dev.exe
./setup-dev.exe -configure --prefix $out
'';
buildInputs = [ ocaml findlib oasis ocaml_optcomp camlp4 ];
createFindlibDestdir = true;
meta = {
homepage = https://github.com/ocsigen/deriving;
description = "Extension to OCaml for deriving functions from type declarations";
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.gal_bolle
maintainers = with stdenv.lib.maintainers; [
gal_bolle vbgl
];
};

4
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "6.3";
version = "6.4";
name = "checkstyle-${version}";
src = fetchurl {
url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
sha256 = "181wm6yxyf9dsp1dgy7bpjz5j72a5fc818293k5mxr8g1gf0s3f4";
sha256 = "0qk653i8973ygz630siava3fm54vxmahbw6rikdi9lzjlpvvn74f";
};
installPhase = ''

2
pkgs/development/tools/analysis/coan/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://coan2.sourceforge.net/;
license = with licenses; bsd3;
platforms = with platforms; all;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};
}

4
pkgs/development/tools/build-managers/gradle/default.nix
View File

@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
mkdir -pv $out
cp -rv lib $out
gradle_launcher_jar=$(echo $out/lib/gradle-launcher-*.jar)
test -f $gradle_launcher_jar
makeWrapper ${jdk}/bin/java $out/bin/gradle \
--set JAVA_HOME ${jdk} \
--add-flags "-classpath $out/lib/gradle-launcher-2.2.1.jar org.gradle.launcher.GradleMain"
--add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain"
'';
phases = "unpackPhase installPhase";

4
pkgs/development/tools/misc/dfu-programmer/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libusb }:
let
version = "0.7.1";
version = "0.7.2";
in
stdenv.mkDerivation rec {
name="dfu-programmer-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz";
sha256 = "0cwy7z5h6f13yx9bkgh61bphzii6lcl21j2gckskphf37bfzazwz";
sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x";
};
configureFlags = [ "--disable-libusb_1_0" ];

29
pkgs/development/tools/misc/sipp/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{stdenv, fetchurl, ncurses, libpcap }:
stdenv.mkDerivation rec {
version = "3.4-beta2";
name = "sipp-${version}";
src = fetchurl {
url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz";
sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv";
};
configurePhase = ''
export ac_cv_lib_curses_initscr=yes
export ac_cv_lib_pthread_pthread_mutex_init=yes
sed -i "s@-lcurses@-lncurses@g" ./configure
sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp
./configure --prefix=$out --with-pcap
'';
postInstall = ''
mkdir -pv $out/share/pcap
cp pcap/* $out/share/pcap
'';
buildInputs = [ncurses libpcap];
}

29
pkgs/development/web/nodejs/build-node-package.nix
View File

@@ -57,15 +57,20 @@ let
mv $(find . -type d -mindepth 1 -maxdepth 1) $out
'';
platforms = fold (entry: platforms:
let
filterPlatforms = attrByPath [(removePrefix "!" entry)] [] stdenv.lib.platforms;
in
if hasPrefix "!" entry then
filter (p: any (f: p != f) filterPlatforms) platforms
else
filter (p: any (f: p == f) filterPlatforms) platforms
) nodejs.meta.platforms os;
platforms = if os == [] then nodejs.meta.platforms else
fold (entry: platforms:
let
filterPlatforms =
stdenv.lib.platforms.${removePrefix "!" entry} or [];
in
# Ignore unknown platforms
if filterPlatforms == [] then platforms
else
if hasPrefix "!" entry then
substract (intersect filterPlatforms nodejs.meta.platforms) platforms
else
platforms ++ (intersect filterPlatforms nodejs.meta.platforms)
) [] os;
mapDependencies = deps: f: rec {
# Convert deps to attribute set
@@ -87,8 +92,8 @@ let
_dependencies = mapDependencies deps (name: dep:
dep.pkgName != pkgName);
_optionalDependencies = mapDependencies optionalDependencies (name: dep:
any (platform: stdenv.system == platform) dep.meta.platforms &&
all (d: d != dep.pkgName) skipOptionalDependencies
(builtins.tryEval dep).success &&
!(elem dep.pkgName skipOptionalDependencies)
);
_peerDependencies = mapDependencies peerDependencies (name: dep:
dep.pkgName != pkgName);
@@ -301,7 +306,7 @@ let
dontStrip = true;
meta = {
platforms = platforms;
inherit platforms;
maintainers = [ stdenv.lib.maintainers.offline ];
};