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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-07-05 13:06:02 -07:00
parent 2363660191 2d1aafef55
commit d605663ae2
155 changed files with 4271 additions and 2114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
pkgs/development/compilers/cudatoolkit/5.5.nix
View File

@@ -1,62 +1,6 @@
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
} :
{ callPackage, ... } @ args:
stdenv.mkDerivation rec {
name = "cudatoolkit-5.5.22";
dontPatchELF = true;
dontStrip = true;
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run;
sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
}
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.cc.cc}/lib64";
unpackPhase = ''
sh $src --keep --noexec
cd pkg/run_files
sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
sh cuda-samples-linux-5.5.22-16488124.run --keep --noexec
cd pkg
'';
buildPhase = ''
find . -type f -executable -exec patchelf \
--set-interpreter "$(cat $NIX_CC/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_CC/nix-support/orig-cc)/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;
};
}
callPackage ./generic.nix (args // rec {
version = "5.5.22";
sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
})

67
pkgs/development/compilers/cudatoolkit/6.0.nix
View File

@@ -1,63 +1,6 @@
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
} :
stdenv.mkDerivation rec {
name = "cudatoolkit-6.0.37";
dontPatchELF = true;
dontStrip = true;
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run;
sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
}
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.cc.cc}/lib64";
unpackPhase = ''
sh $src --keep --noexec
cd pkg/run_files
sh cuda-linux64-rel-6.0.37-18176142.run --keep --noexec
sh cuda-samples-linux-6.0.37-18176142.run --keep --noexec
cd pkg
'';
buildPhase = ''
find . -type f -executable -exec patchelf \
--set-interpreter "$(cat $NIX_CC/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_CC/nix-support/orig-cc)/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;
};
}
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "6.0.37";
sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
})

73
pkgs/development/compilers/cudatoolkit/6.5.nix
View File

@@ -1,69 +1,6 @@
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
}:
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 = [
glibc
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.cc.cc}/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_CC/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_CC/nix-support/orig-cc)/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
# let's remove the 32-bit libraries, they confuse the lib64->lib mover
rm -rf $out/lib
'';
setupHook = ./setup-hook.sh;
meta = {
license = lib.licenses.unfree;
};
}
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "6.5.19";
sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
})

7
pkgs/development/compilers/cudatoolkit/7.0.nix Normal file
View File

@@ -0,0 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "7.0.28";
sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run";
})

73
pkgs/development/compilers/cudatoolkit/generic.nix Normal file
View File

@@ -0,0 +1,73 @@
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
# generic inputs
, version, sha256, url ? null, ...
} :
let
# eg, 5.5.22 => 5_5
mkShort = let str = stdenv.lib.strings;
take = stdenv.lib.lists.take;
in v: str.concatStringsSep "_" (take 2 (str.splitString "." v));
shortVer = mkShort version;
in stdenv.mkDerivation rec {
name = "cudatoolkit-${version}";
dontPatchELF = true;
dontStrip = true;
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = if url != null then url else "http://developer.download.nvidia.com/compute/cuda/${shortVer}/rel/installers/cuda_${version}_linux_64.run";
sha256 = sha256;
}
else throw "cudatoolkit does not support platform ${stdenv.system}";
outputs = [ "out" "sdk" ];
buildInputs = [ perl ];
runtimeDependencies = [
ncurses expat python zlib glibc
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.cc.cc}/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_CC/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_CC/nix-support/orig-cc)/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
# let's remove the 32-bit libraries, they confuse the lib64->lib mover
rm -rf $out/lib
'';
setupHook = ./setup-hook.sh;
meta = {
license = lib.licenses.unfree;
};
}

56
pkgs/development/compilers/ghc/7.10.2.nix Normal file
View File

@@ -0,0 +1,56 @@
{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }:
let
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
${stdenv.lib.optionalString stdenv.isDarwin ''
libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
''}
'';
in
stdenv.mkDerivation rec {
version = "7.10.1.20150630";
name = "ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/7.10.2-rc2/${name}-src.tar.xz";
sha256 = "1wxf7jkkgpvvrg3q311c4rca4vsxrqrmnrqg4j4klgj445yj82gb";
};
buildInputs = [ ghc perl ];
enableParallelBuilding = true;
preConfigure = ''
echo >mk/build.mk "${buildMK}"
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
'';
configureFlags = [
"--with-gcc=${stdenv.cc}/bin/cc"
"--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
];
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
inherit (ghc.meta) license platforms;
};
}

6
pkgs/development/compilers/ghc/head.nix
View File

@@ -17,14 +17,14 @@ let
in
stdenv.mkDerivation rec {
version = "7.11.20150607";
version = "7.11.20150705";
name = "ghc-${version}";
rev = "89223ce1340654455a9f3aa9cbf25f30884227fd";
rev = "3fabb71a559b493efdfb5bb91907f6a0f696a114";
src = fetchgit {
url = "git://git.haskell.org/ghc.git";
inherit rev;
sha256 = "1qsv2n5js21kqphq92xlyc91f11fnr9sh1glqzsirc8xr60dg5cs";
sha256 = "1c0fsk2yk08x02n6s722d36igc9prrql4wcnr8m8c62wp4yrf25z";
};
postUnpack = ''

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
version = "1.2.12";
version = "1.2.13";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "1bf98wi3gz8n09prwmxa38b2mhq69rqq11s9h9swi3avy5wchnxn";
sha256 = "018jxd7f39a5aimjzfjdj739m3jq82k0qi59032v48gqrfa3mng6";
};
buildInputs = [ which ]

17
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -135,6 +135,7 @@ self: super: {
});
# The Haddock phase fails for one reason or another.
acme-one = dontHaddock super.acme-one;
attoparsec-conduit = dontHaddock super.attoparsec-conduit;
base-noprelude = dontHaddock super.base-noprelude;
blaze-builder-conduit = dontHaddock super.blaze-builder-conduit;
@@ -330,6 +331,7 @@ self: super: {
bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw
concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw
digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1
hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
@@ -344,14 +346,15 @@ self: super: {
raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw
riak = dontCheck super.riak; # http://hydra.cryp.to/build/498763/log/raw
scotty-binding-play = dontCheck super.scotty-binding-play;
serversession-backend-redis = dontCheck super.serversession-backend-redis;
slack-api = dontCheck super.slack-api; # https://github.com/mpickering/slack-api/issues/5
socket = dontCheck super.socket;
stackage = dontCheck super.stackage; # http://hydra.cryp.to/build/501867/nixlog/1/raw
textocat-api = dontCheck super.textocat-api; # http://hydra.cryp.to/build/887011/log/raw
warp = dontCheck super.warp; # http://hydra.cryp.to/build/501073/nixlog/5/raw
wreq = dontCheck super.wreq; # http://hydra.cryp.to/build/501895/nixlog/1/raw
wreq-sb = dontCheck super.wreq-sb; # http://hydra.cryp.to/build/783948/log/raw
wuss = dontCheck super.wuss; # http://hydra.cryp.to/build/875964/nixlog/2/raw
serversession-backend-redis = dontCheck super.serversession-backend-redis;
# https://github.com/NICTA/digit/issues/3
digit = dontCheck super.digit;
@@ -626,6 +629,7 @@ self: super: {
# https://github.com/srijs/hwsl2/issues/1
hwsl2 = markBroken super.hwsl2;
hwsl2-reducers = dontDistribute super.hwsl2-reducers;
# https://code.google.com/p/linux-music-player/issues/detail?id=1
mp = markBroken super.mp;
@@ -794,9 +798,6 @@ self: super: {
# Patch to consider NIX_GHC just like xmonad does
dyre = appendPatch super.dyre ./dyre-nix.patch;
# https://github.com/gwern/mueval/issues/9
mueval = appendPatch (appendPatch super.mueval ./mueval-fix.patch) ./mueval-nix.patch;
# Test suite won't compile against tasty-hunit 0.9.x.
zlib = dontCheck super.zlib;
@@ -820,6 +821,7 @@ self: super: {
# https://github.com/goldfirere/singletons/issues/118
clash-lib = dontDistribute super.clash-lib;
clash-verilog = dontDistribute super.clash-verilog;
Frames = dontDistribute super.Frames;
hgeometry = dontDistribute super.hgeometry;
hipe = dontDistribute super.hipe;
singleton-nats = dontDistribute super.singleton-nats;
@@ -898,4 +900,11 @@ self: super: {
# https://github.com/commercialhaskell/stack/issues/409
stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });
# Missing dependency on some hid-usb library.
hid = markBroken super.hid;
msi-kb-backlit = dontDistribute super.msi-kb-backlit;
# Hydra no longer allows building texlive packages.
lhs2tex = dontDistribute super.lhs2tex;
}

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

File diff suppressed because it is too large Load Diff

90
pkgs/development/haskell-modules/mueval-fix.patch
View File

@@ -1,90 +0,0 @@
diff --git a/Mueval/ArgsParse.hs b/Mueval/ArgsParse.hs
index 05c8fd9..0c32e27 100644
--- a/Mueval/ArgsParse.hs
+++ b/Mueval/ArgsParse.hs
@@ -1,10 +1,9 @@
+{-# LANGUAGE CPP #-}
module Mueval.ArgsParse (Options(..), interpreterOpts, getOptions) where
import Control.Monad (liftM)
import System.Console.GetOpt
-import qualified Codec.Binary.UTF8.String as Codec (decodeString)
-
import Mueval.Context (defaultModules, defaultPackages)
-- | See the results of --help for information on what each option means.
@@ -98,4 +97,11 @@ header = "Usage: mueval [OPTION...] --expression EXPRESSION..."
-- | Just give us the end result options; this parsing for
-- us. Bonus points for handling UTF.
getOptions :: [String] -> Either (Bool, String) Options
-getOptions = interpreterOpts . map Codec.decodeString
\ No newline at end of file
+getOptions = interpreterOpts . map decodeString
+
+decodeString :: String -> String
+#if __GLASGOW_HASKELL__ >= 702
+decodeString = id
+#else
+decodeString = Codec.decodeString
+#endif
diff --git a/Mueval/Context.hs b/Mueval/Context.hs
index 78925cf..548514c 100644
--- a/Mueval/Context.hs
+++ b/Mueval/Context.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
module Mueval.Context (
cleanModules,
defaultModules,
@@ -32,7 +33,9 @@ defaultModules = ["Prelude",
"Control.Monad.Error",
"Control.Monad.Fix",
"Control.Monad.Identity",
+#if !MIN_VERSION_base(4,7,0)
"Control.Monad.Instances",
+#endif
"Control.Monad.RWS",
"Control.Monad.Reader",
"Control.Monad.State",
diff --git a/Mueval/Interpreter.hs b/Mueval/Interpreter.hs
index 29b771f..6c39482 100644
--- a/Mueval/Interpreter.hs
+++ b/Mueval/Interpreter.hs
@@ -1,4 +1,5 @@
{-# LANGUAGE PatternGuards #-}
+{-# LANGUAGE FlexibleContexts #-}
-- TODO: suggest the convenience functions be put into Hint proper?
module Mueval.Interpreter where
@@ -12,8 +13,6 @@ import System.Exit (exitFailure)
import System.FilePath.Posix (takeFileName)
import qualified Control.Exception.Extensible as E (evaluate,catch,SomeException(..))
-import qualified System.IO.UTF8 as UTF (putStrLn)
-
import Language.Haskell.Interpreter (eval, set, reset, setImportsQ, loadModules, liftIO,
installedModulesInScope, languageExtensions,
typeOf, setTopLevelModules, runInterpreter, glasgowExtensions,
@@ -100,7 +99,7 @@ mvload lfl = do canonfile <- makeRelativeToCurrentDirectory lfl
-- flooding. Lambdabot has a similar limit.
sayIO :: String -> IO ()
sayIO str = do (out,b) <- render 1024 str
- UTF.putStrLn out
+ putStrLn out
when b exitFailure
-- | Oh no, something has gone wrong. If it's a compilation error pretty print
diff --git a/mueval.cabal b/mueval.cabal
index 3f9406d..b86d796 100644
--- a/mueval.cabal
+++ b/mueval.cabal
@@ -32,7 +32,7 @@ library
exposed-modules: Mueval.Parallel, Mueval.Context, Mueval.Interpreter,
Mueval.ArgsParse, Mueval.Resources
build-depends: base>=4 && < 5, containers, directory, mtl>2, filepath, unix, process,
- hint>=0.3.1, show>=0.3, utf8-string, Cabal, extensible-exceptions, simple-reflect
+ hint>=0.3.1, show>=0.3, Cabal, extensible-exceptions, simple-reflect
ghc-options: -Wall -static
executable mueval-core

23
pkgs/development/haskell-modules/mueval-nix.patch
View File

@@ -1,23 +0,0 @@
diff --git a/Mueval/Interpreter.hs b/Mueval/Interpreter.hs
index 29b771f..6360ee3 100644
--- a/Mueval/Interpreter.hs
+++ b/Mueval/Interpreter.hs
@@ -8,6 +8,7 @@ import Control.Monad.Writer (Any(..),runWriterT,tell)
import Data.Char (isDigit)
import Data.List (stripPrefix)
import System.Directory (copyFile, makeRelativeToCurrentDirectory, removeFile, setCurrentDirectory)
+import System.Environment (lookupEnv)
import System.Exit (exitFailure)
import System.FilePath.Posix (takeFileName)
import qualified Control.Exception.Extensible as E (evaluate,catch,SomeException(..))
@@ -47,6 +48,10 @@ interpreter Options { extensions = exts, namedExtensions = nexts,
-- Explicitly adding ImplicitPrelude because of
-- http://darcsden.com/jcpetruzza/hint/issue/1
unless (null lexts) $ set [languageExtensions := (UnknownExtension "ImplicitPrelude" : lexts)]
+ pkgs' <- liftIO $ lookupEnv "NIX_GHC_LIBDIR"
+ case pkgs' of
+ Just pkgs -> unsafeSetGhcOption ("-package-db " ++ pkgs ++ "/package.conf.d")
+ Nothing -> return ()
when trust $ do
unsafeSetGhcOption "-fpackage-trust"
forM_ (trustPkgs >>= words) $ \pkg ->

4
pkgs/development/interpreters/angelscript/default.nix
View File

@@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="angelscript";
version = "2.30.0";
version = "2.30.1";
name="${baseName}-${version}";
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "00w7h2g6g1lkq9ahsvzyk78nbdzhn1adsrns9mrqb2fbxv2wbz5d";
sha256 = "10ym7185h26gzmw5v6wz8zlycw8gzygv0aw87dmgjcyy7qfk74m4";
};
buildInputs = [
unzip

4
pkgs/development/libraries/allegro/5-unstable.nix
View File

@@ -16,7 +16,7 @@ let
sourceInfo = rec {
baseName="allegro";
folderSuffix = "-unstable";
version = "5.1.10";
version = "5.1.11";
name="${baseName}-${version}";
project="alleg";
url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz";
@@ -26,7 +26,7 @@ in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = "13dfs007pyh908bm1hg7hz71y8fr9fj51byh5w149h8dsq2dds78";
sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs";
};
inherit (sourceInfo) name version;

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

@@ -1,7 +1,7 @@
{stdenv, fetchurl, cmake}:
let
version = "3.2.4";
version = "3.2.5";
in
stdenv.mkDerivation {
name = "eigen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
sha256 = "19c6as664a3kxvkhas2cq19r6ag19jw9lcz04sc0kza6i1hlh9xv";
sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi";
};
nativeBuildInputs = [ cmake ];

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

@@ -11,11 +11,11 @@ let
"${gnupg}/bin/gpg2";
in
stdenv.mkDerivation rec {
name = "gpgme-1.5.4";
name = "gpgme-1.5.5";
src = fetchurl {
url = "mirror://gnupg/gpgme/${name}.tar.bz2";
sha256 = "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v";
sha256 = "01y28fkq52wwf4p470wscaxd2vgzl615irmafx3mj3380x8ksg8b";
};
propagatedBuildInputs = [ libgpgerror glib libassuan pth ];

15
pkgs/development/libraries/ilmbase/default.nix
View File

@@ -1,13 +1,12 @@
{ stdenv, openexr, automake, autoconf, libtool, which }:
{ stdenv, fetchurl, automake, autoconf, libtool, which }:
stdenv.mkDerivation {
name = "ilmbase-${openexr.source.version}";
src = openexr.source.src;
stdenv.mkDerivation rec {
name = "ilmbase-2.2.0";
prePatch = ''
cd IlmBase
'';
src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c";
};
preConfigure = ''
./bootstrap

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

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ sqlite kyotocabinet ];
buildPhase = ''
make all db_bench{,_sqlite3,_tree_db} leveldbutil
make all db_bench{,_sqlite3,_tree_db} leveldbutil libmemenv.a
'';
installPhase = "
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
cp -r include $out
cp lib* $out/lib
cp db_bench{,_sqlite3,_tree_db} leveldbutil $out/bin
mkdir -p $out/include/leveldb/helpers
cp helpers/memenv/memenv.h $out/include/leveldb/helpers
";
meta = with stdenv.lib; {

26
pkgs/development/libraries/libbladeRF/default.nix
View File

@@ -1,14 +1,15 @@
{ stdenv, fetchgit, pkgconfig, cmake, git, doxygen, help2man, tecla, libusb1, udev }:
{ stdenv, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, tecla
, libusb1, udev }:
stdenv.mkDerivation rec {
version = "1.1.0";
version = "1.4.0";
name = "libbladeRF-v${version}";
src = fetchgit {
url = "https://github.com/Nuand/bladeRF/";
rev = "refs/tags/libbladeRF_v${version}";
sha256 = "19qd26yflig51scknyjf3r3nmnc2bni75294jpsv0idzqfj87lbr";
name = "libbladeRF_v${version}-checkout";
src = fetchFromGitHub {
owner = "Nuand";
repo = "bladeRF";
rev = "libbladeRF_v${version}";
sha256 = "1y00hqsmqaix4dql8mb75zx87zvn8b483yxv53x9qyjspksbs60c";
};
buildInputs = [ pkgconfig cmake git doxygen help2man tecla libusb1 udev ];
@@ -19,7 +20,6 @@ stdenv.mkDerivation rec {
# Let us avoid nettools as a dependency.
patchPhase = ''
sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
sed -i 's/ --no-info/ --no-info --no-discard-stderr/' host/utilities/bladeRF-cli/CMakeLists.txt
'';
cmakeFlags = [
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
"-DBUILD_DOCUMENTATION=ON"
];
meta = {
homepage = "https://www.nuand.com/";
meta = with stdenv.lib; {
homepage = https://www.nuand.com/;
description = "Supporting library of the BladeRF SDR opensource hardware";
license = stdenv.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.funfunctor ];
platforms = with stdenv.lib.platforms; linux;
license = licenses.lgpl21;
maintainers = with maintainers; [ funfunctor ];
platforms = platforms.linux;
};
}

6
pkgs/development/libraries/libmediainfo/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
version = "0.7.74";
version = "0.7.75";
name = "libmediainfo-${version}";
src = fetchurl {
url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2";
sha256 = "1dn7zwqkl08vafc979i1mx63r2jlr95gfazg4d2cc9v3pav28zpk";
url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
sha256 = "1im39kd595ia6g41qvwgvszn1s10nwa3q5r2lj2g5fm4kgi0dwhr";
};
buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];

8
pkgs/development/libraries/libmwaw/default.nix
View File

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="libmwaw";
version="0.3.4";
version="0.3.5";
name="${baseName}-${version}";
hash="1sn95flxrh85qjsg1kk700c1ggxaaccr9j1nnw7x4daw8lky25ac";
url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.4/libmwaw-0.3.4.tar.xz";
sha256="1sn95flxrh85qjsg1kk700c1ggxaaccr9j1nnw7x4daw8lky25ac";
hash="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.5/libmwaw-0.3.5.tar.xz";
sha256="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
};
buildInputs = [
boost pkgconfig cppunit zlib libwpg libwpd librevenge

8
pkgs/development/libraries/libodfgen/default.nix
View File

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="libodfgen";
version="0.1.3";
version="0.1.4";
name="${baseName}-${version}";
hash="1flfh1i4r116aqdlqpgpmyzpcylwba48l7mddj25a2cwgsc9v86k";
url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.3/libodfgen-0.1.3.tar.xz";
sha256="1flfh1i4r116aqdlqpgpmyzpcylwba48l7mddj25a2cwgsc9v86k";
hash="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.4/libodfgen-0.1.4.tar.xz";
sha256="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
};
buildInputs = [
boost pkgconfig cppunit zlib libwpg libwpd librevenge

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

@@ -1,10 +1,10 @@
{stdenv, fetchurl, zlib, openssl}:
stdenv.mkDerivation rec {
version = "0.4.12";
version = "0.4.13";
name = "libre-${version}";
src=fetchurl {
url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
sha256 = "1wjdcf5wr50d86rysj5haz53v7d58j7sszpc6k5b4mn1x6604i0d";
sha256 = "0496nfi7vi6ivnyici5bqs147pwkdqn48w2rajhr5k8jd07pq5qp";
};
buildInputs = [zlib openssl];
makeFlags = [

22
pkgs/development/libraries/libspotify/default.nix
View File

@@ -1,8 +1,11 @@
{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }:
let version = "12.1.51"; in
let
version = "12.1.51";
isLinux = (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux");
in
if (stdenv.system != "x86_64-linux" && stdenv.system != "x86_64-darwin")
if (stdenv.system != "x86_64-linux" && stdenv.system != "x86_64-darwin" && stdenv.system != "i686-linux")
then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here"
else stdenv.mkDerivation {
name = "libspotify-${version}";
@@ -18,6 +21,11 @@ else stdenv.mkDerivation {
url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Darwin-universal.zip";
sha256 = "1gcgrc8arim3hnszcc886lmcdb4iigc08abkaa02l6gng43ky1c0";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-i686-release.tar.gz";
sha256 = "1bjmn64gbr4p9irq426yap4ipq9rb84zsyhjjr7frmmw22xb86ll";
}
else
null;
@@ -26,9 +34,9 @@ else stdenv.mkDerivation {
# no patch or build phase for darwin
phases =
[ "unpackPhase" ] ++
(stdenv.lib.optionals (stdenv.system == "x86_64-linux") [ "patchPhase" "buildPhase" ]) ++
(stdenv.lib.optionals (isLinux) [ "patchPhase" "buildPhase" ]) ++
[ "installPhase" ];
installPhase = if (stdenv.system == "x86_64-linux")
installPhase = if (isLinux)
then "installPhase"
else ''
mkdir -p "$out"/include/libspotify
@@ -46,11 +54,11 @@ else stdenv.mkDerivation {
buildInputs = stdenv.lib.optional (stdenv.system == "x86_64-darwin") unzip;
# linux-specific
installFlags = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
installFlags = stdenv.lib.optionalString (isLinux)
"prefix=$(out)";
patchPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
patchPhase = stdenv.lib.optionalString (isLinux)
"${gnused}/bin/sed -i 's/ldconfig//' Makefile";
postInstall = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
postInstall = stdenv.lib.optionalString (isLinux)
"mv -v share $out";
passthru = {

37
pkgs/development/libraries/lmdb/default.nix Normal file
View File

@@ -0,0 +1,37 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "lmdb-${version}";
version = "0.9.15";
src = fetchzip {
url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz";
sha256 = "0p79fpyh1yx2jg1f0kag5zsdn4spkgs1j3dxibvqdy32wkbpxd0g";
};
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
makeFlags = "prefix=$(out)";
doCheck = true;
checkPhase = "make test";
preInstall = ''
mkdir -p $out/{man/man1,bin,lib,include}
'';
meta = with stdenv.lib; {
description = "Lightning memory-mapped database";
longDescription = ''
LMDB is an ultra-fast, ultra-compact key-value embedded data store
developed by Symas for the OpenLDAP Project. It uses memory-mapped files,
so it has the read performance of a pure in-memory database while still
offering the persistence of standard disk-based databases, and is only
limited to the size of the virtual address space.
'';
homepage = http://symas.com/mdb/;
maintainers = with maintainers; [ jb55 ];
license = licenses.openldap;
platforms = platforms.all;
};
}

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

@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }:
# The exact revision specified by Blender's install_deps.sh script.
let rev = "18da7f4109a8eafaa290a33f5550501cc4c8bae8"; in
let rev = "3335ac164e68b2512a40914b14c74db260e6ff7d"; in
stdenv.mkDerivation {
name = "opencollada-1.3-${rev}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
owner = "KhronosGroup";
repo = "OpenCOLLADA";
inherit rev;
sha256 = "0ach32ws95mh0ijd8sr22kxka3riq72bb9ng46vs3615dxn7h18d";
sha256 = "0s2m8crbg1kf09hpscrplv65a45dlg157b9c20chrv7wy0qizbw5";
};
buildInputs = [ cmake pkgconfig ];

27
pkgs/development/libraries/openexr/default.nix
View File

@@ -1,33 +1,28 @@
{ stdenv, callPackage, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
let
source = callPackage ./source.nix { };
in
stdenv.mkDerivation rec {
name = "openexr-${source.version}";
src = source.src;
{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
prePatch = ''
cd OpenEXR
'';
stdenv.mkDerivation rec {
name = "openexr-${lib.getVersion ilmbase}";
src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n";
};
preConfigure = ''
./bootstrap
'';
configureFlags = [ "--enable-imfexamples" ];
buildInputs = [ autoconf automake libtool pkgconfig ];
propagatedBuildInputs = [ ilmbase zlib ];
enableParallelBuilding = true;
patches = [ ./bootstrap.patch ];
meta = with stdenv.lib; {
homepage = http://www.openexr.com/;
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ wkennington ];
};
passthru.source = source;
}

11
pkgs/development/libraries/openexr/source.nix
View File

@@ -1,11 +0,0 @@
{ fetchFromGitHub }:
rec {
version = "2.2.0";
src = fetchFromGitHub {
owner = "openexr";
repo = "openexr";
rev = "v${version}";
sha256 = "030vj2jk3n65x1wl0rmxzpl1bd5mzmld2lzn7sg92svpnghry6a8";
};
}

7
pkgs/development/libraries/qt-5/5.4/setup-hook.sh
View File

@@ -46,10 +46,11 @@ cp "@out@/bin/qmake" "$qtOut/bin"
cat >"$qtOut/bin/qt.conf" <<EOF
[Paths]
Prefix = $qtOut
Plugins = $qtOut/lib/qt5/plugins
Imports = $qtOut/lib/qt5/imports
Qml2Imports = $qtOut/lib/qt5/qml
Plugins = lib/qt5/plugins
Imports = lib/qt5/imports
Qml2Imports = lib/qt5/qml
EOF
export QMAKE="$qtOut/bin/qmake"
envHooks+=(addQtModule)
preConfigurePhases+=" setQMakePath"

19
pkgs/development/ocaml-modules/csv/default.nix
View File

@@ -1,29 +1,30 @@
{stdenv, fetchurl, ocaml, findlib}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
{ stdenv, fetchzip, ocaml, findlib }:
stdenv.mkDerivation {
name = "ocaml-csv-1.3.3";
name = "ocaml-csv-1.4";
src = fetchurl {
url = "https://forge.ocamlcore.org/frs/download.php/1376/csv-1.3.3.tar.gz";
sha256 = "19qsvw3n7k4xpy0sw7n5s29kzj91myihjljhr5js6xcxwj4cydh2";
src = fetchzip {
url = https://github.com/Chris00/ocaml-csv/releases/download/1.4/csv-1.4.tar.gz;
sha256 = "0si0v79rxzyzmgyhd6lidpzxdlcpprlhg0pgrsf688g83xsclkwa";
};
buildInputs = [ ocaml findlib ];
createFindlibDestdir = true;
configurePhase = "ocaml setup.ml -configure --prefix $out";
configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
buildPhase = "ocaml setup.ml -build";
doCheck = true;
checkPhase = "ocaml setup.ml -test";
installPhase = "ocaml setup.ml -install";
meta = with stdenv.lib; {
description = "A pure OCaml library to read and write CSV files";
homepage = "https://forge.ocamlcore.org/projects/csv/";
homepage = https://github.com/Chris00/ocaml-csv;
license = licenses.lgpl21;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;

29
pkgs/development/ocaml-modules/qcheck/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, fetchzip, ocaml, findlib, oasis, ounit }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
stdenv.mkDerivation {
name = "ocaml-qcheck-0.4.0.1";
src = fetchzip {
url = https://github.com/c-cube/qcheck/archive/0.4.0.1.tar.gz;
sha256 = "0j2jdrfz8rrslgjihnfgg8yy12860z2vvf7hqzjbmfmf03hz4pgv";
};
buildInputs = [ ocaml findlib oasis ounit ];
configureFlags = "--enable-tests --enable-ounit";
doCheck = true;
checkPhase = "ocaml setup.ml -test";
createFindlibDestdir = true;
meta = {
description = "QuickCheck inspired property-based testing for OCaml";
homepage = https://github.com/c-cube/qcheck/;
license = stdenv.lib.licenses.bsd2;
maintainers = with stdenv.lib.maintainers; [ vbgl ];
platforms = ocaml.meta.platforms;
};
}

12
pkgs/development/ocaml-modules/re/default.nix
View File

@@ -1,17 +1,19 @@
{ stdenv, fetchzip, ocaml, findlib }:
{ stdenv, fetchzip, ocaml, findlib, ounit }:
stdenv.mkDerivation rec {
name = "ocaml-re-1.4.0";
name = "ocaml-re-1.4.1";
src = fetchzip {
url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz";
sha256 = "1xcfmhjgd7prqx2g1addlrk84xpfafmqnpjkqrvg7mw0hn1p7v2m";
sha256 = "1wmfgazydd20hc796zisqpmsw0sb5lv9g3x77ckmf50v3z8hyhvk";
};
buildInputs = [ ocaml findlib ];
buildInputs = [ ocaml findlib ounit ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
buildPhase = "ocaml setup.ml -build";
doCheck = true;
checkPhase = "ocaml setup.ml -test";
installPhase = "ocaml setup.ml -install";
createFindlibDestdir = true;

16
pkgs/development/ocaml-modules/stringext/default.nix
View File

@@ -1,19 +1,25 @@
{ stdenv, fetchzip, ocaml, findlib }:
{ stdenv, fetchzip, ocaml, findlib, ounit, qcheck
# Optionally enable tests; test script use OCaml-4.01+ features
, doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"
}:
let version = "1.3.0"; in
let version = "1.4.0"; in
stdenv.mkDerivation {
name = "ocaml-stringext-${version}";
src = fetchzip {
url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz";
sha256 = "0sd1chyxclmip0nxqhasp1ri91bwxr8nszkkr5kpja45f6bav6k9";
sha256 = "1jp0x9rkss8a48z9wbnc4v5zvmnysin30345psl3xnxb2aqzwlii";
};
buildInputs = [ ocaml findlib ];
buildInputs = [ ocaml findlib ounit qcheck ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
configurePhase = "ocaml setup.ml -configure --prefix $out"
+ stdenv.lib.optionalString doCheck " --enable-tests";
buildPhase = "ocaml setup.ml -build";
inherit doCheck;
checkPhase = "ocaml setup.ml -test";
installPhase = "ocaml setup.ml -install";
createFindlibDestdir = true;

2
pkgs/development/ocaml-modules/ulex/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation {
homepage = http://www.cduce.org/download.html;
description = "A lexer generator for Unicode and OCaml";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
platforms = ocaml.meta.platforms;
maintainers = [ stdenv.lib.maintainers.roconnor ];
};
}

12
pkgs/development/ocaml-modules/uri/default.nix
View File

@@ -1,25 +1,27 @@
{ stdenv, fetchzip, ocaml, findlib, re, sexplib, stringext }:
{ stdenv, fetchzip, ocaml, findlib, re, sexplib, stringext, ounit }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
let version = "1.9.0"; in
let version = "1.9.1"; in
stdenv.mkDerivation {
name = "ocaml-uri-${version}";
src = fetchzip {
url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz";
sha256 = "13vbv6q7npl2bvvqfw03mav90jcrrvjbdpdp4y8mcjz0iax5ww9b";
sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85";
};
buildInputs = [ ocaml findlib ];
buildInputs = [ ocaml findlib ounit ];
propagatedBuildInputs = [ re sexplib stringext ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
buildPhase = ''
ocaml setup.ml -build
ocaml setup.ml -doc
'';
doCheck = true;
checkPhase = "ocaml setup.ml -test";
installPhase = "ocaml setup.ml -install";
createFindlibDestdir = true;

6
pkgs/development/qtcreator/default.nix
View File

@@ -3,8 +3,8 @@
with stdenv.lib;
let
baseVersion = "3.2";
revision = "1";
baseVersion = "3.4";
revision = "2";
version = "${baseVersion}.${revision}";
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
sha256 = "0kp7czn9mzncdpq8bx15s3sy13g4xlcdz7y7zy0s9350g4ijs8fx";
sha256 = "1asbfphws0aqs92gjgh0iqzr1911kg51r9al44jxpfk88yazjzgm";
};
# This property can be used in a nix development environment to refer to the Qt package

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

@@ -2,7 +2,7 @@
let
name = "scons";
version = "2.3.4";
version = "2.3.5";
in
stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
sha256 = "0hdlci43wjz8maryj83mz04ir6rwcdrrzpd7cpzvdlzycqhdfmsb";
sha256 = "0hlwkrr5fkjpjgmwipp9a2bnc9riqks2pjc3rvjsq0a8j7hr72ca";
};
buildInputs = [python makeWrapper];

13
pkgs/development/tools/misc/ccache/default.nix
View File

@@ -1,23 +1,24 @@
{ stdenv, fetchurl, runCommand, gcc, perl, zlib }:
{ stdenv, fetchurl, runCommand, gcc, zlib }:
let
# TODO: find out if there's harm in just using 'rec' instead.
name = "ccache-${version}";
version = "3.2.2";
sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag";
doCheck = true;
ccache =
stdenv.mkDerivation {
inherit name doCheck;
inherit name;
src = fetchurl {
inherit sha256;
url = "mirror://samba/ccache/${name}.tar.xz";
};
# The test dependency on perl should be gone in the next release:
buildInputs = [ zlib ]
++ stdenv.lib.optionals doCheck [ perl ];
patches = [ ./test-drop-perl-requirement.patch ];
buildInputs = [ zlib ];
doCheck = true;
passthru = {
# A derivation that provides gcc and g++ commands, but that

36
pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch Normal file
View File

@@ -0,0 +1,36 @@
Since perl is used in just one place and can easily be replaced by a
little bit of shell, do so. This makes testing on limited systems
easier.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
INSTALL.txt | 1 -
test.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/INSTALL.txt b/INSTALL.txt
index 256beab..f77cbe6 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -67,7 +67,6 @@ In addition to the prerequisites mentioned above, you also need:
To debug and run the performance test suite you'll also need:
-- Perl (http://www.perl.org/)
- Python (http://www.python.org/)
Run "./autogen.sh" and then follow the steps mentioned under "Installation"
diff --git a/test.sh b/test.sh
index f14e287..1090649 100755
--- a/test.sh
+++ b/test.sh
@@ -1834,7 +1834,7 @@ prepare_cleanup_test() {
mkdir -p $dir
i=0
while [ $i -lt 10 ]; do
- perl -e 'print "A" x 4017' >$dir/result$i-4017.o
+ printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
touch $dir/result$i-4017.stderr
touch $dir/result$i-4017.d
if [ $i -gt 5 ]; then
--

14
pkgs/development/tools/ocaml/ocp-index/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
let inherit (stdenv.lib) getVersion versionAtLeast optional; in
@@ -6,7 +6,13 @@ assert versionAtLeast (getVersion ocaml) "3.12.1";
assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
assert versionAtLeast (getVersion ocpIndent) "1.4.2";
let version = "1.1.1"; in
let
version = "1.1.2";
patch402 = fetchurl {
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-index/ocp-index.1.1.2/files/ocaml.4.02.patch;
sha256 = "1wcpn2pv7h8ia3ybmzdlm8v5hfvq1rgmlj02wwj0yh3vqjvxqvsm";
};
in
stdenv.mkDerivation {
@@ -14,9 +20,11 @@ stdenv.mkDerivation {
src = fetchzip {
url = "http://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz";
sha256 = "173lqbyivwv1zf9ifpxa9f8m2y3kybzs3idrwyzy824ixdqv2fww";
sha256 = "0cz0bz5nisc5r23b1w07q2bl489gd09mg8rp9kyq9m6rj669b18l";
};
patches = optional (versionAtLeast (getVersion ocaml) "4.02") patch402;
buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;
propagatedBuildInputs = [ ocpIndent ];

4
pkgs/development/web/iojs/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
let
version = "2.3.1";
version = "2.3.3";
inherit (stdenv.lib) optional maintainers licenses platforms;
in stdenv.mkDerivation {
name = "iojs-${version}";
src = fetchurl {
url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
sha256 = "1vkahs7ky551gl52l8j8f2w8ajasjblqqmhird5ll87wccx8w6f2";
sha256 = "12fdz0as1sa34bq4a701qwrznpn7y1wq0yxlr5yw494ifchfm103";
};
prePatch = ''

3
pkgs/development/web/nodejs/default.nix
View File

@@ -42,9 +42,6 @@ in stdenv.mkDerivation {
patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null;
postPatch = if stdenv.isDarwin then ''
(cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
'' else null;
preBuild = if stdenv.isDarwin then ''
patchShebangs .