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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
This commit is contained in:
Tuomas Tynkkynen
2016-05-03 23:12:48 +03:00
parent 2362891dc8 e7d3166656
commit aadaa91379
506 changed files with 31436 additions and 5404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/build-managers/cargo/snapshot.nix
View File

@@ -49,7 +49,7 @@ stdenv.mkDerivation {
./install.sh "--prefix=$out"
'' + (if stdenv.isLinux then ''
patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
--set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib.out}/lib" \
--set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/:${zlib.out}/lib" \
"$out/bin/cargo"
'' else "") + postInstall;
}

2
pkgs/development/tools/build-managers/rake/Gemfile Normal file
View File

@@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'rake'

13
pkgs/development/tools/build-managers/rake/Gemfile.lock Normal file
View File

@@ -0,0 +1,13 @@
GEM
remote: https://rubygems.org/
specs:
rake (11.1.1)
PLATFORMS
ruby
DEPENDENCIES
rake
BUNDLED WITH
1.10.5

17
pkgs/development/tools/build-managers/rake/default.nix Normal file
View File

@@ -0,0 +1,17 @@
{ lib, bundlerEnv, ruby }:
bundlerEnv {
name = "rake-11.1.1";
inherit ruby;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
meta = with lib; {
description = "A software task management and build automation tool";
homepage = https://github.com/ruby/rake;
license = with licenses; mit;
platforms = platforms.unix;
};
}

9
pkgs/development/tools/build-managers/rake/gemset.nix Normal file
View File

@@ -0,0 +1,9 @@
{
"rake" = {
version = "11.1.1";
source = {
type = "gem";
sha256 = "0h8wcic2xh3lv7yvs05pqnfqb80jyl488f7136lgxmajb0s1rqhg";
};
};
}

57
pkgs/development/tools/casperjs/default.nix
View File

@@ -1,40 +1,49 @@
{ stdenv, fetchgit, python, phantomjs }:
{ stdenv, fetchFromGitHub, fontsConf, phantomjs2, python, nodePackages }:
stdenv.mkDerivation rec {
name = "casperjs-1.0.0-RC5";
let version = "1.1.1";
src = fetchgit {
url = "git://github.com/n1k0/casperjs.git";
rev = "refs/tags/1.0.0-RC5";
sha256 = "e7fd6b94b4b304416159196208dea7f6e8841a667df102eb378a698a92f0f2c7";
in stdenv.mkDerivation rec {
name = "casperjs-${version}";
src = fetchFromGitHub {
owner = "casperjs";
repo = "casperjs";
rev = version;
sha256 = "187prrm728xpn0nx9kxfxa4fwd7w25z78nsxfk6a6kl7c5656jpz";
};
buildInputs = [ phantomjs2 python nodePackages.eslint ];
patchPhase = ''
substituteInPlace bin/casperjs --replace "/usr/bin/env python" "${python}/bin/python" \
--replace "'phantomjs'" "'${phantomjs}/bin/phantomjs'"
--replace "'phantomjs'" "'${phantomjs2}/bin/phantomjs'"
'';
dontBuild = true;
doCheck = true;
checkPhase = ''
export FONTCONFIG_FILE=${fontsConf}
make test
'';
installPhase = ''
mkdir -p $out/share/casperjs $out/bin
cp -a . $out/share/casperjs/.
ln -s $out/share/casperjs/bin/casperjs $out/bin
mv $PWD $out
'';
meta = {
description = "Navigation scripting & testing utility for PhantomJS";
description = ''
Navigation scripting & testing utility for PhantomJS and SlimerJS
'';
longDescription = ''
CasperJS is a navigation scripting & testing utility for PhantomJS.
It eases the process of defining a full navigation scenario and provides useful high-level
functions, methods & syntaxic sugar for doing common tasks such as:
- defining & ordering navigation steps
- filling forms
- clicking links
- capturing screenshots of a page (or an area)
- making assertions on remote DOM
- logging & events
- downloading base64 encoded resources, even binary ones
- catching errors and react accordingly
- writing functional test suites, exporting results as JUnit XML (xUnit)
CasperJS is a navigation scripting & testing utility for PhantomJS and
SlimerJS (still experimental). It eases the process of defining a full
navigation scenario and provides useful high-level functions, methods &
syntactic sugar for doing common tasks.
'';
homepage = http://casperjs.org;

27
pkgs/development/tools/imatix_gsl/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, pcre } :
stdenv.mkDerivation rec {
name = "imatix_gsl";
version = "4.1";
src = fetchFromGitHub {
owner = "imatix";
repo = "gsl";
rev = "72192d0d9de17de08d9379602d6482b4e5d402d0";
sha256 = "1apy11avgqc27xlczyjh15y10qjdyqsqab1wrl2067qgpdiy58w7";
};
buildInputs = [ pcre ];
postPatch = "sed -e 's,/usr/bin/install,install,g' -i src/Makefile";
preBuild = "cd src";
installFlags = "DESTDIR=$(out)";
meta = with stdenv.lib; {
license = licenses.gpl3Plus;
homepage = https://github.com/imatix/gsl/;
description = "A universal code generator";
platforms = platforms.unix;
maintainer = [ maintainers.moosingin3space ];
};
}

6
pkgs/development/tools/misc/autoconf-archive/default.nix
View File

@@ -1,12 +1,14 @@
{ stdenv, fetchurl, xz }:
stdenv.mkDerivation rec {
name = "autoconf-archive-${version}";
version = "2015.09.25";
version = "2016.03.20";
src = fetchurl {
url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
sha256 = "02im1jn0igzn2qpxkgiwxvcm3jgvjaypg955pi9h2d6jvfjnf13w";
sha256 = "0dz4fnc723jqn3by22ds5fys7g31apzm1r9allldvva0yvzjxyw8";
};
buildInputs = [ xz ];
meta = with stdenv.lib; {

2
pkgs/development/tools/misc/saleae-logic/default.nix
View File

@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
# Patch it
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic"
patchelf --set-rpath "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"
# Build the LD_PRELOAD library that makes Logic work from a read-only directory
mkdir -p "$out/lib"

4
pkgs/development/tools/misc/yodl/default.nix
View File

@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yodl-${version}";
version = "3.06.00";
version = "3.08.00";
buildInputs = [ perl icmake ];
src = fetchFromGitHub {
sha256 = "03n03bxc5lh3v9yzdikqrzzdvrna8zf98mlg2dhnn5z5sb5jhyzc";
sha256 = "107jhywx0xdyp7yll1c5zwngzjl3yvg1b4yan8wl2acnbrv6hwa4";
rev = version;
repo = "yodl";
owner = "fbb-git";

6
pkgs/development/tools/node-webkit/nw12.nix
View File

@@ -11,10 +11,12 @@ let
paths = [
xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf
freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc
xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
libnotify
];
extraOutputsToInstall = [ "lib" "out" ];
};
in stdenv.mkDerivation rec {
@@ -39,7 +41,7 @@ in stdenv.mkDerivation rec {
ln -s ${libudev.out}/lib/libudev.so $out/share/nwjs/libudev.so.0
patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nw
patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw
patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
mkdir -p $out/bin

6
pkgs/development/tools/ocaml/camlp5/default.nix
View File

@@ -7,11 +7,11 @@ in
stdenv.mkDerivation {
name = "camlp5${if transitional then "_transitional" else ""}-6.14";
name = "camlp5${if transitional then "_transitional" else ""}-6.16";
src = fetchurl {
url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.14.tgz;
sha256 = "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89";
url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.16.tgz;
sha256 = "1caqa2rl7rav7pfwv1l1j0j18yr1qzyyqz0wa9519x91ckznqi7x";
};
buildInputs = [ ocaml ];

10
pkgs/development/tools/parsing/lemon/default.nix
View File

@@ -4,20 +4,20 @@ let
srcs = {
lemon = fetchurl {
sha256 = "1grm95m2cnc61zim332g7z8nchmcy91ljf50k13lm421v0ygyyv6";
url = "http://www.sqlite.org/src/raw/tool/lemon.c?name=039f813b520b9395740c52f9cbf36c90b5d8df03";
sha256 = "1c5pk2hz7j9hix5mpc38rwnm8dnlr2jqswf4lan6v78ccbyqzkjx";
url = "http://www.sqlite.org/src/raw/tool/lemon.c?name=680980c7935bfa1edec20c804c9e5ba4b1dd96f5";
name = "lemon.c";
};
lempar = fetchurl {
sha256 = "09nki0cwc5zrm365g6plhjxz3byhl9w117ab3yvrpds43ks1j85z";
url = "http://www.sqlite.org/src/raw/tool/lempar.c?name=3617143ddb9b176c3605defe6a9c798793280120";
sha256 = "1ba13a6yh9j2cs1aw2fh4dxqvgf399gxq1gpp4sh8q0f2w6qiw3i";
url = "http://www.sqlite.org/src/raw/tool/lempar.c?name=01ca97f87610d1dac6d8cd96ab109ab1130e76dc";
name = "lempar.c";
};
};
in stdenv.mkDerivation rec {
name = "lemon-${version}";
version = "1.0";
version = "1.69";
phases = [ "buildPhase" "installPhase" ];

24
pkgs/development/tools/rtags/default.nix
View File

@@ -1,30 +1,22 @@
{ stdenv, fetchgit, cmake, llvm, openssl, clang, writeScript, bash }:
{ stdenv, fetchgit, cmake, llvmPackages, openssl, writeScript, bash, emacs }:
let llvm-config-wrapper = writeScript "llvm-config" ''
#! ${bash}/bin/bash
if [[ "$1" = "--cxxflags" ]]; then
echo $(${llvm}/bin/llvm-config "$@") -isystem ${clang.cc}/include
else
${llvm}/bin/llvm-config "$@"
fi
'';
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "rtags-${version}";
rev = "9fed420d20935faf55770765591fc2de02eeee28";
version = "${stdenv.lib.strings.substring 0 7 rev}";
version = "git-2016-04-29";
rev = "233543d343bf86fa31c35ee21242fa2da3a965ab";
buildInputs = [ cmake llvm openssl clang ];
buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ];
preConfigure = ''
export LIBCLANG_LLVM_CONFIG_EXECUTABLE=${llvm-config-wrapper}
export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags)" \
LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
'';
src = fetchgit {
inherit rev;
fetchSubmodules = true;
url = "https://github.com/andersbakken/rtags.git";
sha256 = "1sb6wfknhvrgirqp65paz7kihv4zgg8g5f7a7i14i10sysalxbif";
sha256 = "1jzmpbkx1z8dnpr0ndclb6c3dxnf90ifr8j1nzz4j8cvzdpc3lzc";
};
meta = {