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

Merge branch 'master' of git://github.com/NixOS/nixpkgs

Browse Source
This commit is contained in:
Daniel Beecham 2015-01-10 18:38:07 +01:00
commit 66f7542f79
28 changed files with 4039 additions and 2867 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/audio/mpg321/default.nix
View File

@ -1,20 +1,28 @@
{stdenv, fetchurl, libao, libmad, libid3tag, zlib}:
{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib}:
stdenv.mkDerivation rec {
name = "mpg321-0.2.13-2";
name = "mpg321-${version}";
version = "0.3.2";
src = fetchurl {
url = "mirror://sourceforge/mpg321/0.2.13/${name}.tar.gz";
sha256 = "0zx9xyr97frlyrwyk2msm9h1sn2b84vqaxcy5drbzcd2n585lwlx";
url = "mirror://sourceforge/mpg321/${version}/mpg321_${version}.orig.tar.gz";
sha256 = "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5";
};
buildInputs = [libao libid3tag libmad zlib];
configureFlags = [
("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no"))
];
meta = {
buildInputs = [libao libid3tag libmad zlib]
++ stdenv.lib.optional stdenv.isLinux alsaLib;
installTargets = "install install-man";
meta = with stdenv.lib; {
description = "Command-line MP3 player";
homepage = http://mpg321.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu;
license = licenses.gpl2;
maintainers = [ maintainers.rycee ];
platforms = platforms.gnu;
};
}

8
pkgs/applications/misc/blender/default.nix
View File

@ -10,11 +10,11 @@
with lib;
stdenv.mkDerivation rec {
name = "blender-2.72b";
name = "blender-2.73";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "0ixz8h3c08p4f84x8r85nzddwvc0h5lw1ci8gdg2x3m2mw2cfdj4";
sha256 = "140fcxjb73gim430v08021ls3civ3yghld63ljkgxi5vaww1cq95";
};
patches = [(fetchpatch {
@ -42,6 +42,10 @@ stdenv.mkDerivation rec {
"-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON"
"-DWITH_INSTALL_PORTABLE=OFF"
"-DWITH_FFTW3=ON"
"-DWITH_SDL=ON"
"-DWITH_GAMEENGINE=ON"
"-DWITH_OPENCOLORIO=ON"
"-DPYTHON_LIBRARY=python${python.majorVersion}m"
"-DPYTHON_LIBPATH=${python}/lib"
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"

4
pkgs/applications/misc/pgadmin/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pgadmin3-${version}";
version = "1.18.1";
version = "1.20.0";
src = fetchurl {
url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
sha256 = "1h6bqslw53q44vy7z1q7wmxkgqdzxacfs8pfm2fxm8vcd8lkxb17";
sha256 = "133bcbx9a322adldd1498h8bn2wfk45v1sbj9269jylwda1dfwq7";
};
buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];

12
pkgs/applications/networking/msmtp/default.nix
View File

@ -1,15 +1,21 @@
{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
stdenv.mkDerivation rec {
name = "msmtp-1.4.32";
version = "1.6.1";
name = "msmtp-${version}";
src = fetchurl {
url = "mirror://sourceforge/msmtp/${name}.tar.bz2";
sha256 = "122z38pv4q03w3mbnhrhg4w85a51258sfdg2ips0b6cgwz3wbw1b";
url = "mirror://sourceforge/msmtp/${name}.tar.xz";
sha256 = "1ws6hdpm8vfq4vwxjwgd8xndx5ax1ppnmxn0fhzlwj3pvkr4fpf4";
};
buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];
postInstall = ''
cp scripts/msmtpq/msmtp-queue scripts/msmtpq/msmtpq $prefix/bin/
chmod +x $prefix/bin/msmtp-queue $prefix/bin/msmtpq
'';
meta = {
description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
homepage = "http://msmtp.sourceforge.net/";

5
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -73,9 +73,8 @@ rec {
};
hub = import ./hub {
inherit (rubyLibs) rake;
inherit stdenv fetchurl groff makeWrapper;
git = gitBase;
inherit go;
inherit stdenv fetchgit;
};
gitFastExport = import ./fast-export {

50
pkgs/applications/version-management/git-and-tools/hub/default.nix
View File

@ -1,28 +1,48 @@
{ stdenv, fetchurl, git, groff, rake, makeWrapper }:
{ stdenv, fetchgit, go }:
stdenv.mkDerivation rec {
name = "hub-${version}";
version = "1.12.2";
version = "2.2.0-rc1";
src = fetchurl {
url = "https://github.com/github/hub/archive/v${version}.tar.gz";
sha256 = "112yfv9xklsmwv859kypv7hz0a6dj5hkrmjp7z1h40nrljc9mi79";
src = fetchgit {
url = https://github.com/github/hub.git;
rev = "refs/tags/v${version}";
sha256 = "1f6r8vlwnmqmr85drfv24vhqx1aacz6s83c2i804v9997n0wrwfm";
};
buildInputs = [ rake makeWrapper ];
buildInputs = [ go ];
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
buildPhase = ''
./script/build
'';
installPhase = ''
rake install "prefix=$out"
mkdir -p "$out/bin"
cp hub "$out/bin/"
mkdir -p "$out/share/man/man1"
cp "man/hub.1" "$out/share/man/man1/"
mkdir -p "$out/share/zsh/site-functions"
cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub"
# Broken: https://github.com/github/hub/issues/592
# mkdir -p "$out/etc/bash_completion.d"
# cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/"
# Should we also install provided git-hooks?
# ?
'';
fixupPhase = ''
wrapProgram $out/bin/hub --prefix PATH : ${groff}/bin:${git}/bin
'';
meta = {
description = "A GitHub specific wrapper for git";
homepage = "http://defunkt.io/hub/";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
meta = with stdenv.lib; {
description = "Command-line wrapper for git that makes you better at GitHub";
license = licenses.mit;
homepage = https://hub.github.com/;
maintainers = with maintainers; [ the-kenny ];
};
}

4
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -15,12 +15,12 @@
}:
stdenv.mkDerivation rec {
version = "7.3.0";
version = "7.5.0";
name = "mkvtoolnix-${version}";
src = fetchurl {
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
sha256 = "086lg64pki6mz00h0a735hgvz4347zbcp3wz384sigqndn99zc1c";
sha256 = "0ksv79zcpp34jzs77r02x119c0h2wyvkgckd0bbwjix0qyczgfhp";
};
buildInputs = [

8
pkgs/development/compilers/julia/0.3.3.nix → pkgs/development/compilers/julia/0.3.5.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
, ncurses, libunistring, patchelf, openblas, liblapack
, tcl, tk, xproto, libX11, git, mpfr, which
, tcl, tk, xproto, libX11, git, mpfr, which, wget
} :
assert stdenv.isLinux;
@ -11,7 +11,7 @@ let
in
stdenv.mkDerivation rec {
pname = "julia";
version = "0.3.3";
version = "0.3.5";
name = "${pname}-${version}";
dsfmt_ver = "2.2";
@ -63,13 +63,13 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "refs/tags/v${version}";
md5 = "84266f0201ad34abe8ca1474620fe891";
md5 = "abdee0e64f8e9ae3d96e37734e2db40a";
name = "julia-git-v${version}";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
openblas liblapack tcl tk xproto libX11 git mpfr which
openblas liblapack tcl tk xproto libX11 git mpfr which wget
];
configurePhase = ''

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

@ -35,7 +35,7 @@ self: super: {
# https://github.com/haskell/time/issues/23
time_1_5_0_1 = overrideCabal super.time_1_5_0_1 (drv: { doCheck = false; });
# Hacks to make packages compile.
# Hacks to make packages compile. Are these still necessary??? HELP!
abstract-deque = overrideCabal super.abstract-deque (drv: { doCheck = false; });
accelerate-cuda = overrideCabal super.accelerate-cuda (drv: { jailbreak = true; });
accelerate = overrideCabal super.accelerate (drv: { jailbreak = true; });
@ -374,5 +374,27 @@ self: super: {
zeromq3-haskell = overrideCabal super.zeromq3-haskell (drv: { doCheck = false; });
zip-archive = overrideCabal super.zip-archive (drv: { doCheck = false; });
zlib-conduit = overrideCabal super.zlib-conduit (drv: { noHaddock = true; });
}
// {
# Not on Hackage yet.
cabal2nix = self.mkDerivation {
pname = "cabal2nix";
version = "2.0";
src = pkgs.fetchgit {
url = "git://github.com/NixOS/cabal2nix.git";
sha256 = "b9dde970f8e64fd5faff9402f5788ee832874d7584a67210f59f2c5e504ce631";
rev = "6398667f4ad670eb3aa3334044a65a06971494d0";
};
isLibrary = false;
isExecutable = true;
buildDepends = with self; [
aeson base bytestring Cabal containers deepseq directory filepath
hackage-db monad-par monad-par-extras mtl pretty process
regex-posix SHA split transformers utf8-string
];
testDepends = with self; [ base doctest ];
homepage = "http://github.com/NixOS/cabal2nix";
description = "Convert Cabal files into Nix build instructions";
license = pkgs.stdenv.lib.licenses.bsd3;
};
}

18
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
View File

@ -55,21 +55,3 @@ self: super: {
ghcjs = self.callPackage ../compilers/ghcjs { Cabal = self.Cabal_1_22_0_0; };
}
// # packages related to amazonka
(let
amazonkaEnv = self: super: {
mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
mtl = self.mtl_2_2_1;
nats = self.nats_0_2;
transformers = self.transformers_0_4_2_0;
transformers-compat = overrideCabal super.transformers-compat (drv: { configureFlags = []; });
};
in
{
# These packages need mtl 2.2.x to compile.
amazonka-core = super.amazonka-core.overrideScope amazonkaEnv;
amazonka = super.amazonka.overrideScope amazonkaEnv;
amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv;
})

43
pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
View File

@ -76,13 +76,38 @@ self: super: {
# https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
syb = overrideCabal super.syb (drv: { doCheck = false; });
# doctest doesn't work with GHC 7.10.x.
# https://github.com/sol/doctest/issues/94
cabal2nix = overrideCabal super.cabal2nix (drv: { doCheck = false; });
comonad = overrideCabal super.comonad (drv: { doCheck = false; });
distributive = overrideCabal super.distributive (drv: { doCheck = false; });
hackage-db = overrideCabal super.hackage-db (drv: { doCheck = false; });
hsemail = overrideCabal super.hsemail (drv: { doCheck = false; });
http-types = overrideCabal super.http-types (drv: { doCheck = false; });
lens = overrideCabal super.lens (drv: { doCheck = false; });
# Version 1.19.5 fails its test suite.
happy = overrideCabal super.happy (drv: { doCheck = false; });
# Test suite hangs silently without consuming any CPU.
# https://github.com/ndmitchell/extra/issues/4
extra = overrideCabal super.extra (drv: { doCheck = false; });
}
// {
# Not on Hackage yet.
doctest = self.mkDerivation {
pname = "doctest";
version = "0.9.11.1";
src = pkgs.fetchgit {
url = "git://github.com/sol/doctest.git";
sha256 = "a01ced437f5d733f916dc62ea6a67e0e5d275164ba317da33245cf9374f23925";
rev = "c85fdaaa92d1f0334d835254d63bdc30f7077387";
};
isLibrary = true;
isExecutable = true;
doCheck = false;
buildDepends = with self; [
base deepseq directory filepath ghc ghc-paths process syb
transformers
];
testDepends = with self; [
base base-compat deepseq directory filepath ghc ghc-paths hspec
HUnit process QuickCheck setenv silently stringbuilder syb
transformers
];
homepage = "https://github.com/sol/doctest#readme";
description = "Test interactive Haskell examples";
license = pkgs.stdenv.lib.licenses.mit;
};
}

8
pkgs/development/haskell-modules/default.nix
View File

@ -16,9 +16,9 @@ let
let
mkDerivation = pkgs.callPackage ./generic-builder.nix {
inherit stdenv ghc;
inherit stdenv;
inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
inherit (self) jailbreak-cabal;
inherit (self) ghc jailbreak-cabal;
hscolour = overrideCabal self.hscolour (drv: {
isLibrary = false;
noHaddock = true;
@ -41,10 +41,12 @@ let
in
import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // {
inherit ghc mkDerivation callPackage;
inherit mkDerivation callPackage;
ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix { packages = pkgs self; };
ghc = ghc // { withPackages = self.ghcWithPackages; };
};
compatLayer = if provideOldAttributeNames then import ./compat-layer.nix else (self: super: {});

152
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -2,42 +2,43 @@
, jailbreak-cabal, hscolour
}:
{ pname, version, sha256 ? null
{ pname
, version
, sha256 ? null
, src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
, buildDepends ? []
, extraLibraries ? []
, configureFlags ? []
, configureFlagsArray ? []
, pkgconfigDepends ? []
, noHaddock ? false
, buildTools ? []
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, preConfigure ? "", postConfigure ? ""
, preBuild ? "", postBuild ? ""
, installPhase ? "", preInstall ? "", postInstall ? ""
, checkPhase ? "", preCheck ? "", postCheck ? ""
, preFixup ? "", postFixup ? ""
, isExecutable ? false, isLibrary ? !isExecutable
, propagatedUserEnvPkgs ? []
, testDepends ? []
, doCheck ? stdenv.lib.versionOlder "7.4" ghc.version, testTarget ? ""
, configureFlags ? []
, description ? ""
, doCheck ? stdenv.lib.versionOlder "7.4" ghc.version
, doHoogle ? true
, jailbreak ? false
, hyperlinkSource ? true
, editedCabalFile ? null
, enableLibraryProfiling ? false
, enableSharedExecutables ? stdenv.lib.versionOlder "7.7" ghc.version
, enableSharedLibraries ? stdenv.lib.versionOlder "7.7" ghc.version
, enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013
, enableStaticLibraries ? true
, extraLibraries ? []
, homepage ? "http://hackage.haskell.org/package/${pname}"
, description ? "no description available"
, license
, editedCabalFile ? null
, platforms ? ghc.meta.platforms
, hydraPlatforms ? ghc.meta.hydraPlatforms or ghc.meta.platforms
, broken ? false
, hyperlinkSource ? true
, isExecutable ? false, isLibrary ? !isExecutable
, jailbreak ? false
, license
, maintainers ? []
, noHaddock ? false
, passthru ? {}
, pkgconfigDepends ? []
, platforms ? ghc.meta.platforms
, testDepends ? []
, testTarget ? ""
, broken ? false
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, preConfigure ? "", postConfigure ? ""
, preBuild ? "", postBuild ? ""
, preInstall ? "", postInstall ? ""
, checkPhase ? "", preCheck ? "", postCheck ? ""
, preFixup ? "", postFixup ? ""
}:
assert pkgconfigDepends != [] -> pkgconfig != null;
@ -45,7 +46,7 @@ assert pkgconfigDepends != [] -> pkgconfig != null;
let
inherit (stdenv.lib) optional optionals optionalString versionOlder
concatStringsSep enableFeature;
concatStringsSep enableFeature optionalAttrs;
defaultSetupHs = builtins.toFile "Setup.hs" ''
import Distribution.Simple
@ -68,8 +69,19 @@ let
sha256 = editedCabalFile;
};
isHaskellPkg = x: (x ? pname) && (x ? version);
isSystemPkg = x: !isHaskellPkg x;
allBuildInputs = stdenv.lib.filter (x: x != null) (
buildDepends ++ extraLibraries ++ buildTools ++
optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends) ++
optionals doCheck testDepends
);
haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs;
in
stdenv.mkDerivation {
stdenv.mkDerivation ({
name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}";
inherit src;
@ -79,14 +91,6 @@ stdenv.mkDerivation {
optionals doCheck testDepends;
propagatedNativeBuildInputs = buildDepends;
inherit propagatedUserEnvPkgs;
inherit patches patchPhase prePatch postPatch;
inherit preConfigure postConfigure configureFlags configureFlagsArray;
inherit preBuild postBuild;
inherit preInstall postInstall;
inherit doCheck preCheck postCheck;
inherit preFixup postFixup;
# GHC needs the locale configured during the Haddock phase.
LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
@ -111,11 +115,16 @@ stdenv.mkDerivation {
setupCompileFlags="-j$NIX_BUILD_CORES"
''}
local confDir=$out/nix-support/ghc-${ghc.version}-package.conf.d
mkdir -p $confDir
for p in $propagatedNativeBuildInputs $nativeBuildInputs; do
if [ -d "$p/nix-support/ghc-${ghc.version}-package.conf.d" ]; then
cp -f "$p/nix-support/ghc-${ghc.version}-package.conf.d/"*.conf $confDir/
packageConfDir="$TMP/package.conf.d"
mkdir -p $packageConfDir
local inputClosure=""
for i in $propagatedNativeBuildInputs $nativeBuildInputs; do
findInputs $i inputClosure propagated-native-build-inputs
done
for p in $inputClosure; do
if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
continue
fi
if [ -d "$p/include" ]; then
@ -127,8 +136,8 @@ stdenv.mkDerivation {
fi
done
done
ghc-pkg --package-db=$confDir recache
configureFlags+=" --package-db=$confDir"
ghc-pkg --package-db="$packageConfDir" recache
configureFlags+=" --package-db=$packageConfDir"
${optionalString (editedCabalFile != null) ''
echo "Replacing Cabal file with edited version ${newCabalFile}."
@ -143,17 +152,17 @@ stdenv.mkDerivation {
for i in Setup.hs Setup.lhs ${defaultSetupHs}; do
test -f $i && break
done
ghc -package-db=$confDir $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
ghc -package-db=$packageConfDir $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
echo configureFlags: $configureFlags
unset GHC_PACKAGE_PATH # Cabal complains about this variable if it's set.
unset GHC_PACKAGE_PATH # Cabal complains if this variable is set during configure.
./Setup configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
echo >&2 "*** abort because of serious configure-time warning from Cabal"
exit 1
fi
export GHC_PACKAGE_PATH="$confDir:"
export GHC_PACKAGE_PATH="$packageConfDir:"
runHook postConfigure
'';
@ -162,29 +171,30 @@ stdenv.mkDerivation {
runHook preBuild
./Setup build
${optionalString (!noHaddock && hasActiveLibrary) ''
./Setup haddock --html ${optionalString doHoogle "--hoogle"} ${optionalString (hasActiveLibrary && hyperlinkSource) "--hyperlink-source"}
./Setup haddock --html \
${optionalString doHoogle "--hoogle"} \
${optionalString (hasActiveLibrary && hyperlinkSource) "--hyperlink-source"}
''}
runHook postBuild
'';
checkPhase = if installPhase != "" then installPhase else ''
checkPhase = ''
runHook preCheck
./Setup test ${testTarget}
runHook postCheck
'';
installPhase = if installPhase != "" then installPhase else ''
installPhase = ''
runHook preInstall
${if !hasActiveLibrary then "./Setup install" else ''
./Setup copy
local confDir=$out/nix-support/ghc-${ghc.version}-package.conf.d
local pkgConf=$confDir/${pname}-${version}.conf
mkdir -p $confDir
./Setup register --gen-pkg-config=$pkgConf
local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $pkgConf )
mv $pkgConf $confDir/$pkgId.conf
ghc-pkg --package-db=$confDir recache
local packageConfDir="$out/lib/${ghc.name}/package.conf.d"
local packageConfFile="$packageConfDir/${pname}-${version}.conf"
mkdir -p "$packageConfDir"
./Setup register --gen-pkg-config=$packageConfFile
local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
mv $packageConfFile $packageConfDir/$pkgId.conf
''}
${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin) ''
@ -196,9 +206,39 @@ stdenv.mkDerivation {
runHook postInstall
'';
passthru = passthru // { inherit pname version; };
passthru = passthru // {
inherit pname version;
env = stdenv.mkDerivation {
name = "interactive-${optionalString hasActiveLibrary "haskell-"}${pname}-${version}-environment";
nativeBuildInputs = [ (ghc.withPackages (p: haskellBuildInputs)) systemBuildInputs ];
shellHook = "eval $(grep export $(type -p ghc))";
};
meta = {
inherit homepage license description platforms hydraPlatforms maintainers broken;
};
meta = { inherit homepage license platforms hydraPlatforms; }
// optionalAttrs broken { inherit broken; }
// optionalAttrs (description != "") { inherit description; }
// optionalAttrs (maintainers != []) { inherit maintainers; }
;
}
// optionalAttrs (configureFlags != []) { inherit configureFlags; }
// optionalAttrs (patches != []) { inherit patches; }
// optionalAttrs (patchPhase != "") { inherit patchPhase; }
// optionalAttrs (prePatch != "") { inherit prePatch; }
// optionalAttrs (postPatch != "") { inherit postPatch; }
// optionalAttrs (preConfigure != "") { inherit preConfigure; }
// optionalAttrs (postConfigure != "") { inherit postConfigure; }
// optionalAttrs (preBuild != "") { inherit preBuild; }
// optionalAttrs (postBuild != "") { inherit postBuild; }
// optionalAttrs (preInstall != "") { inherit preInstall; }
// optionalAttrs (postInstall != "") { inherit postInstall; }
// optionalAttrs (checkPhase != "") { inherit checkPhase; }
// optionalAttrs (preCheck != "") { inherit preCheck; }
// optionalAttrs (postCheck != "") { inherit postCheck; }
// optionalAttrs (preFixup != "") { inherit preFixup; }
// optionalAttrs (postFixup != "") { inherit postFixup; }
)

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

File diff suppressed because it is too large Load Diff

20
pkgs/development/haskell-modules/with-packages-wrapper.nix
View File

@ -31,11 +31,12 @@ let
docDir = "$out/share/doc/ghc/html";
packageCfgDir = "${libDir}/package.conf.d";
isHaskellPkg = x: (x ? pname) && (x ? version);
paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages);
in
if packages == [] then ghc else
stdenv.lib.addPassthru (buildEnv {
if paths == [] then ghc else
buildEnv {
inherit (ghc) name;
paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc];
paths = paths ++ [ghc];
inherit ignoreCollisions;
postBuild = ''
. ${makeWrapper}/nix-support/setup-hook
@ -72,15 +73,10 @@ stdenv.lib.addPassthru (buildEnv {
makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}"
done
rm $out/lib/${ghc.name}/package.conf.d
mkdir $out/lib/${ghc.name}/package.conf.d
for pkg in $paths; do
for file in "$pkg/nix-support/${ghc.name}-package.conf.d/"*.conf "$pkg/lib/${ghc.name}/package.conf.d/"*.conf; do
ln -sf $file $out/lib/${ghc.name}/package.conf.d/
done
done
$out/bin/ghc-pkg recache
$out/bin/ghc-pkg check
'';
}) { inherit (ghc) version; }
} // {
preferLocalBuild = true;
inherit (ghc) version meta;
}

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

@ -1,9 +1,9 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "getdata-0.8.5";
name = "getdata-0.8.6";
src = fetchurl {
url = "mirror://sourceforge/getdata/${name}.tar.bz2";
sha256 = "0km6hbv18m9g8fxdqfcmk3bjr47w856v4hbrxpd609m6rk0j40zf";
sha256 = "1cxmyqg6m7346q37wrr05zmyip1qcgi4vpy3xki20nxwkaw37lz8";
};
meta = with stdenv.lib; {

2
pkgs/development/tools/build-managers/leiningen/builder.sh
View File

@ -7,7 +7,7 @@ mkdir -pv $out/bin $out/share/java
out_bin=$out/bin/lein
cp -v $src $out_bin
cp -v $jarsrc $out/share/java
cp -v $jarsrc "$out/share/java/$name-standalone.jar"
for p in $patches;
do

9
pkgs/development/tools/build-managers/leiningen/default.nix
View File

@ -3,17 +3,18 @@
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.5.0";
version = "2.5.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "1drl35313xp2gg5y52wp8414i2fm806rhgcsghl4igrm3afrv85x";
sha256 = "0pqqb2bh0a17426diwyhk5vbxcfz45rppbxmjydsmai94jm3cgix";
};
jarsrc = fetchurl {
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar";
sha256 = "0fd7yqrj9asx1n3nszli7hr4fj47v2pdr9msk5g75955pw7yavp9";
# NOTE: This is actually a .jar, Github has issues
url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
sha256 = "1irl3w66xq1xbbs4g10dnw1vknfw8al70nhr744gfn2za27w0xdl";
};
patches = [ ./lein-fix-jar-path.patch ];

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libusb }:
let
version = "0.7.0";
version = "0.7.1";
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 = "17lglglk5xrqd2n0impg5bkq4j96qc51cw3kzcghzmzmn6fvg3gf";
sha256 = "0cwy7z5h6f13yx9bkgh61bphzii6lcl21j2gckskphf37bfzazwz";
};
configureFlags = [ "--disable-libusb_1_0" ];

2
pkgs/development/tools/rust/racer/default.nix
View File

@ -6,7 +6,7 @@ in
stdenv.mkDerivation rec {
#TODO add emacs support
name = "racer-git-2014-12-04";
name = "racer-git-2015-01-07";
src = fetchgit {
url = https://github.com/phildawes/racer;
rev = "bf73c05ac719cd3b0f8d8f9e0ecb066ede6aa9d9";

25
pkgs/servers/ldap/389/default.nix
View File

@ -1,9 +1,11 @@
{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl
, svrcore, icu, net_snmp, kerberos, pcre
, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
}:
let
version = "1.3.3.5";
in
stdenv.mkDerivation rec {
name = "389-ds-base-1.3.3.5";
name = "389-ds-base-${version}";
src = fetchurl {
url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2";
@ -13,9 +15,20 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu
net_snmp kerberos pcre
];
] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
patches = [ ./no-etc.patch ];
# TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
patches = [ ./no-etc.patch ./perl-path.patch ];
preConfigure = ''
# Create perl paths for library imports in perl scripts
PERLPATH=""
for P in $(echo $PERL5LIB | sed 's/:/ /g'); do
PERLPATH="$PERLPATH $(echo $P/*/*)"
done
export PERLPATH
'';
configureFlags = [
"--sysconfdir=/etc"
@ -31,6 +44,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/dirsrv
'';
passthru.version = version;
meta = with stdenv.lib; {
homepage = https://directory.fedoraproject.org/;
description = "enterprise-class Open Source LDAP server for Linux";

12
pkgs/servers/ldap/389/no-etc.patch
View File

@ -1,3 +1,12 @@
From bcdd781b01beba59b9f6993355732070b9487603 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 9 Jan 2015 14:51:46 -0800
Subject: [PATCH 1/2] Makefile: Don't install files to /etc or /var
---
Makefile.in | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 24a9ddf..c97d1e1 100644
--- a/Makefile.in
@ -48,3 +57,6 @@ index 24a9ddf..c97d1e1 100644
install-taskSCRIPTS install-updateDATA install-updateSCRIPTS
install-dvi: install-dvi-am
--
2.1.4

34
pkgs/servers/ldap/389/perl-path.patch Normal file
View File

@ -0,0 +1,34 @@
From 78a814e4d5e8708893b6ed8b673a4577abae05f4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 9 Jan 2015 14:52:11 -0800
Subject: [PATCH 2/2] Makefile: Add PERLPATH to perl files
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index c97d1e1..763bf3b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2870,7 +2870,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
@BUNDLE_FALSE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
@BUNDLE_FALSE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
@BUNDLE_FALSE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
-@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir),g' \
+@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH),g' \
@BUNDLE_FALSE@ -e 's,@defaultuser\@,$(defaultuser),g' \
@BUNDLE_FALSE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
@BUNDLE_FALSE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
@@ -2947,7 +2947,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
@BUNDLE_TRUE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
@BUNDLE_TRUE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
@BUNDLE_TRUE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
-@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \
+@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH) $(libdir)/perl/arch $(libdir)/perl,g' \
@BUNDLE_TRUE@ -e 's,@defaultuser\@,$(defaultuser),g' \
@BUNDLE_TRUE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
@BUNDLE_TRUE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
--
2.1.4

4
pkgs/servers/monitoring/riemann/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "riemann-${version}";
version = "0.2.6";
version = "0.2.7";
src = fetchurl {
url = "http://aphyr.com/riemann/${name}.tar.bz2";
sha256 = "1m1vkvdcpcc93ipzpdlq0lig81yw172qfiqbxlrbjyb0x6j1984d";
sha256 = "1hnjikm24jlfi5qav7gam078k5gynca36xbxr3b3lbhw17kyknwg";
};
phases = [ "unpackPhase" "installPhase" ];

6
pkgs/top-level/all-packages.nix
View File

@ -3555,16 +3555,16 @@ let
suitesparse = suitesparse_4_2;
};
julia033 = let
julia035 = let
liblapack = liblapack_3_5_0.override {shared = true;};
in callPackage ../development/compilers/julia/0.3.3.nix {
in callPackage ../development/compilers/julia/0.3.5.nix {
inherit liblapack;
suitesparse = suitesparse_4_2.override {
inherit liblapack;
};
llvm = llvm_33;
};
julia = julia033;
julia = julia035;
lazarus = callPackage ../development/compilers/fpc/lazarus.nix {
fpc = fpc;

5755
pkgs/top-level/node-packages-generated.nix
View File

File diff suppressed because it is too large Load Diff

1
pkgs/top-level/node-packages.json
View File

@ -148,4 +148,5 @@
, "peerflix-server"
, "trash"
, "empty-trash"
, "castnow"
]

18
pkgs/top-level/perl-packages.nix
View File

@ -6619,6 +6619,20 @@ let self = _self // overrides; _self = with self; {
};
};
MozillaLdap = buildPerlPackage {
name = "Mozilla-Ldap-1.5.3";
USE_OPENLDAP=1;
LDAPSDKDIR=pkgs.openldap;
src = fetchurl {
url = "ftp://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/1.5.3/src/perl-mozldap-1.5.3.tar.gz";
sha256 = "0s0albdw0zvg3w37s7is7gddr4mqwicjxxsy400n1p96l7ipnw4x";
};
meta = {
description = "Mozilla's ldap client library.";
license = "unknown";
};
};
MROCompat = buildPerlPackage {
name = "MRO-Compat-0.12";
src = fetchurl {
@ -6685,10 +6699,10 @@ let self = _self // overrides; _self = with self; {
};
NetAddrIP = buildPerlPackage rec {
name = "NetAddr-IP-4.072";
name = "NetAddr-IP-4.075";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MI/MIKER/${name}.tar.gz";
sha256 = "17gwhhbz25021w5k4ggp8j3plix5yixgb2vr1mj39fa0p3gafm09";
sha256 = "0fc8jvrcp42szscnn41sxz8z8qa4fr4dr9i9s067hvrhiyxpb0mb";
};
};