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:
obadz
2016-08-21 12:03:41 +01:00
parent 15b07f4b8e c2192c664a
commit 68936edfb3
39 changed files with 182 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/fpc/binary.nix
View File

@@ -6,12 +6,12 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.i386-linux.tar";
sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar";
sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx";
}
else throw "Not supported on ${stdenv.system}.";

8
pkgs/development/compilers/mlton/default.nix
View File

@@ -15,22 +15,22 @@ stdenv.mkDerivation rec {
binSrc =
if stdenv.system == "i686-linux" then (fetchurl {
url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz";
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz";
sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
})
else if stdenv.system == "x86_64-linux" then (fetchurl {
url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz";
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz";
sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
})
else if stdenv.system == "x86_64-darwin" then (fetchurl {
url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
})
else throw "Architecture not supported";
codeSrc =
fetchurl {
url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}.src.tgz";
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz";
sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
};

2
pkgs/development/compilers/mozart/binary.nix
View File

@@ -10,7 +10,7 @@ in stdenv.mkDerivation {
name = "mozart-binary-${version}";
src = fetchurl {
url = "http://sourceforge.net/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
};

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

@@ -839,6 +839,9 @@ self: super: {
# https://github.com/guillaume-nargeot/hpc-coveralls/issues/52
hpc-coveralls = disableSharedExecutables super.hpc-coveralls;
# Can't find libHSidris-*.so during build.
idris = disableSharedExecutables super.idris;
# https://github.com/fpco/stackage/issues/838
cryptonite = dontCheck super.cryptonite;

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

@@ -65,6 +65,8 @@ self: super: {
hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
# Setup: At least the following dependencies are missing: base <4.8
hspec-expectations = overrideCabal super.hspec-expectations (drv: {
postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
@@ -203,6 +205,7 @@ self: super: {
hackage-security = dontHaddock (dontCheck super.hackage-security);
# GHC versions prior to 8.x require additional build inputs.
aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale";
aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
bytes = addBuildDepend super.bytes self.doctest;
@@ -210,7 +213,7 @@ self: super: {
semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
Glob_0_7_9 = addBuildDepends super.Glob_0_7_9 (with self; [semigroups]);
Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
Glob = addBuildDepends super.Glob (with self; [semigroups]);
# cereal must have `fail` in pre-ghc-8.0.x versions
# also tests require bytestring>=0.10.8.1

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

@@ -9,11 +9,11 @@
# if you update, also bump pythonPackages.libvirt or it will break
stdenv.mkDerivation rec {
name = "libvirt-${version}";
version = "2.0.0";
version = "2.1.0";
src = fetchurl {
url = "http://libvirt.org/sources/${name}.tar.xz";
sha256 = "1jwszhpjn09zkqji8w1x97rw0wqcl71ll2y6vp056fb1bvshms8h";
sha256 = "0sriasjc573c519yqw1hcfb3qqjcsm9hm8vayw0anwkl6di9ay8s";
};
patches = [ ./build-on-bsd.patch ];

2
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
View File

@@ -131,7 +131,7 @@ stdenv.mkDerivation {
-rpath
-optimized-qmake
-strip
-reduce-relocations
-no-reduce-relocations
-system-proxies
-pkg-config

5
pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
View File

@@ -61,11 +61,6 @@ _qtMultioutDevs() {
preFixupHooks+=(_qtMultioutDevs)
if [[ -z "$NIX_QT_PIC" ]]; then
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
export NIX_QT_PIC=1
fi
_qtSetCMakePrefix() {
export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}"
}

2
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
View File

@@ -107,7 +107,7 @@ stdenv.mkDerivation {
-rpath
-optimized-qmake
-strip
-reduce-relocations
-no-reduce-relocations
-system-proxies
-pkg-config

5
pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
View File

@@ -61,11 +61,6 @@ _qtMultioutDevs() {
preFixupHooks+=(_qtMultioutDevs)
if [[ -z "$NIX_QT_PIC" ]]; then
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
export NIX_QT_PIC=1
fi
_qtSetCMakePrefix() {
export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}"
}

2
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
View File

@@ -106,7 +106,7 @@ stdenv.mkDerivation {
-rpath
-optimized-qmake
-strip
-reduce-relocations
-no-reduce-relocations
-system-proxies
-pkg-config

5
pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh
View File

@@ -61,11 +61,6 @@ _qtMultioutDevs() {
preFixupHooks+=(_qtMultioutDevs)
if [[ -z "$NIX_QT_PIC" ]]; then
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
export NIX_QT_PIC=1
fi
_qtSetCMakePrefix() {
export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}"
}

28
pkgs/development/libraries/torch/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot,
libjpeg_turbo, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip}:
stdenv.mkDerivation rec{
version = "0.0pre20160820";
name = "torch-${version}";
buildInputs = [
luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4
libjpeg_turbo zeromq3 ncurses openssl libpng readline
];
src = fetchgit (stdenv.lib.importJSON ./src.json);
configurePhase = ''
'';
buildPhase = ''
cd ..
export PREFIX=$out
mkdir "$out"
sh install.sh -s
'';
installPhase = ''
'';
meta = {
inherit version;
description = ''A scientific computing framework with wide support for machine learning algorithms'';
license = stdenv.lib.licenses.bsd3 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

6
pkgs/development/libraries/torch/src.json Normal file
View File

@@ -0,0 +1,6 @@
{
"url": "https://github.com/torch/distro",
"rev": "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f",
"sha256": "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy",
"fetchSubmodules": true
}

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

@@ -12,6 +12,8 @@ stdenv.mkDerivation {
createFindlibDestdir = true;
preConfigure = "substituteInPlace Makefile --replace gcc $CC";
installTargets = [ "find_install" ];
meta = {

22
pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch Normal file
View File

@@ -0,0 +1,22 @@
diff --git a/lib/CatalystX/Script/Server/Starman.pm b/lib/CatalystX/Script/Server/Starman.pm
index 670bd74..7b3bd2e 100644
--- a/lib/CatalystX/Script/Server/Starman.pm
+++ b/lib/CatalystX/Script/Server/Starman.pm
@@ -9,7 +9,7 @@ our $VERSION = '0.02';
extends 'Catalyst::Script::Server';
-has '+fork' => ( default => 1, init_arg => undef );
+has '+fork' => ( default => 1 );
has [qw/ keepalive restart restart_delay restart_regex restart_directory/] => ( init_arg => undef, is => 'ro' );
@@ -70,7 +70,7 @@ CatalystX::Script::Server::Starman - Replace the development server with Starman
-d --debug force debug mode
-f --fork handle each request in a new process
- (defaults to false)
+ (defaults to true)
-? --help display this help and exits
-h --host host (defaults to all)
-p --port port (defaults to 3000)

2
pkgs/development/tools/omniorb/default.nix
View File

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "4.2.0";
src = fetchurl rec {
url = "http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl";
};