BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit 'a6f6c0e' into master.upstream

Browse source 
This is a partial merge of staging where we have up to date binaries for
all packages.
This commit is contained in:
William A. Kennington III 2015-09-15 12:16:44 -07:00
commit 773b4deb7c
62 changed files with 224 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/codeblocks/default.nix
View file

@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-pch=no" ] configureFlags = [ "--enable-pch=no" ]
++ optional contribPlugins "--with-contrib-plugins"; ++ optional contribPlugins "--with-contrib-plugins";
# Fix boost 1.59 compat
# Try removing in the next version
CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
meta = with stdenv.lib; { meta = with stdenv.lib; {
maintainers = [ maintainers.linquize ]; maintainers = [ maintainers.linquize ];
platforms = platforms.all; platforms = platforms.all;

6
pkgs/applications/misc/terminal-notifier/default.nix
View file

@ -16,7 +16,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/Applications mkdir -p $out/Applications
mkdir -p $out/bin mkdir -p $out/bin
cp -r terminal-notifier.app $out/Applications cp -r terminal-notifier.app $out/Applications
ln -s $out/Applications/terminal-notifier.app/Contents/MacOS/terminal-notifier $out/bin/terminal-notifier cat >$out/bin/terminal-notifier <<EOF
cd $out/Applications/terminal-notifier.app
exec ./Contents/MacOS/terminal-notifier
EOF
chmod +x $out/bin/terminal-notifier
''; '';
meta = with lib; { meta = with lib; {

2
pkgs/applications/networking/copy-com/default.nix
View file

@ -52,7 +52,7 @@ in stdenv.mkDerivation {
RPATH=${libPaths}:$out/${appdir} RPATH=${libPaths}:$out/${appdir}
echo "Updating rpaths to $RPATH in:" echo "Updating rpaths to $RPATH in:"
find "$out/${appdir}" -type f -a -perm /0100 \ find "$out/${appdir}" -type f -a -perm -0100 \
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
''; '';

4
pkgs/applications/networking/dropbox/default.nix
View file

@ -101,12 +101,12 @@ in stdenv.mkDerivation {
rm "$out/${appdir}/qt.conf" rm "$out/${appdir}/qt.conf"
rm -fr "$out/${appdir}/plugins" rm -fr "$out/${appdir}/plugins"
find "$out/${appdir}" -type f -a -perm /0100 \ find "$out/${appdir}" -type f -a -perm -0100 \
-print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \; -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \;
RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir} RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir}
echo "updating rpaths to: $RPATH" echo "updating rpaths to: $RPATH"
find "$out/${appdir}" -type f -a -perm /0100 \ find "$out/${appdir}" -type f -a -perm -0100 \
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"

4
pkgs/applications/office/libreoffice/default.nix
View file

@ -86,6 +86,10 @@ in stdenv.mkDerivation rec {
QT4DIR = qt4; QT4DIR = qt4;
KDE4DIR = kde4.kdelibs; KDE4DIR = kde4.kdelibs;
# Fix boost 1.59 compat
# Try removing in the next version
CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
preConfigure = '' preConfigure = ''
configureFlagsArray=( configureFlagsArray=(
"--with-parallelism=$NIX_BUILD_CORES" "--with-parallelism=$NIX_BUILD_CORES"

6
pkgs/applications/science/logic/otter/default.nix
View file

@ -20,9 +20,9 @@ stdenv.mkDerivation {
buildPhase = '' buildPhase = ''
find . -name Makefile | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" find . -name Makefile | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g"
find . -name Makefile | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" find . -name Makefile | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g"
find . -perm +111 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g" find . -perm -0100 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g"
find . -perm +111 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" find . -perm -0100 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g"
find . -perm +111 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" find . -perm -0100 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g"
sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile

2
pkgs/applications/science/math/content/default.nix
View file

@ -82,7 +82,7 @@ rec {
find . -name '*.so' -exec cp '{}' $out/lib ';' find . -name '*.so' -exec cp '{}' $out/lib ';'
find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';' find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';'
find . -name '*.hlp' -exec cp '{}' $out/share/${name}/doc ';' find . -name '*.hlp' -exec cp '{}' $out/share/${name}/doc ';'
find . -perm +111 -a ! -name '*.*' -exec cp '{}' $out/bin ';' find . -perm -0100 -a ! -name '*.*' -exec cp '{}' $out/bin ';'
cp -r . $out/share/${name}/build-snapshot cp -r . $out/share/${name}/build-snapshot
'') ["buildContent" "defEnsureDir" "minInit"]; '') ["buildContent" "defEnsureDir" "minInit"];

2
pkgs/applications/science/math/mathematica/9.nix
View file

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
echo "=== PatchElfing away ===" echo "=== PatchElfing away ==="
find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do
type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
if [ -z "$type" ]; then if [ -z "$type" ]; then
: :

2
pkgs/applications/science/math/mathematica/default.nix
View file

@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
echo "=== PatchElfing away ===" echo "=== PatchElfing away ==="
find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do
type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
if [ -z "$type" ]; then if [ -z "$type" ]; then
: :

1
pkgs/applications/video/gnash/default.nix
View file

@ -117,5 +117,6 @@ stdenv.mkDerivation rec {
maintainers = [ ]; maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; platforms = stdenv.lib.platforms.gnu;
broken = true;
}; };
} // {mozillaPlugin = "/plugins";} } // {mozillaPlugin = "/plugins";}

2
pkgs/build-support/builder-defs/builder-defs.nix
View file

@ -569,7 +569,7 @@ let inherit (builtins) head tail trace; in
# Interpreters that are already in the store are left untouched. # Interpreters that are already in the store are left untouched.
echo "patching script interpreter paths" echo "patching script interpreter paths"
local f local f
for f in $(find "${dir}" -xtype f -perm /0100); do for f in $(find "${dir}" -xtype f -perm -0100); do
local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f") local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")
if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then
local newPath=$(type -P $(basename $oldPath) || true) local newPath=$(type -P $(basename $oldPath) || true)

2
pkgs/build-support/cc-wrapper/default.nix
View file

@ -244,7 +244,7 @@ stdenv.mkDerivation {
if stdenv.isArm then "ld-linux*.so.3" else if stdenv.isArm then "ld-linux*.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else if stdenv.system == "powerpc-linux" then "ld.so.1" else
if stdenv.system == "mips64el-linux" then "ld.so.1" else if stdenv.system == "mips64el-linux" then "ld.so.1" else
if stdenv.system == "x86_64-darwin" then "${dyld}/lib/dyld" else if stdenv.system == "x86_64-darwin" then "/usr/lib/dyld" else
abort "Don't know the name of the dynamic linker for this platform.") abort "Don't know the name of the dynamic linker for this platform.")
else ""; else "";

2
pkgs/build-support/setup-hooks/patch-shebangs.sh
View file

@ -18,7 +18,7 @@ patchShebangs() {
local oldInterpreterLine local oldInterpreterLine
local newInterpreterLine local newInterpreterLine
find "$dir" -type f -perm /0100 | while read f; do find "$dir" -type f -perm -0100 | while read f; do
if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then
# missing shebang => not a script # missing shebang => not a script
continue continue

2
pkgs/development/compilers/ghc/6.10.2-binary.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
# On Linux, use patchelf to modify the executables so that they can # On Linux, use patchelf to modify the executables so that they can
# find editline/gmp. # find editline/gmp.
(if stdenv.isLinux then '' (if stdenv.isLinux then ''
find . -type f -perm +100 \ find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \; --set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \;
for prog in ld ar gcc strip ranlib; do for prog in ld ar gcc strip ranlib; do

2
pkgs/development/compilers/ghc/7.0.4-binary.nix
View file

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
# On Linux, use patchelf to modify the executables so that they can # On Linux, use patchelf to modify the executables so that they can
# find editline/gmp. # find editline/gmp.
stdenv.lib.optionalString stdenv.isLinux '' stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm +100 \ find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${ncurses}/lib:${gmp}/lib" {} \; --set-rpath "${ncurses}/lib:${gmp}/lib" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

2
pkgs/development/compilers/ghc/7.4.2-binary.nix
View file

@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optionalString stdenv.isLinux '' stdenv.lib.optionalString stdenv.isLinux ''
mkdir -p "$out/lib" mkdir -p "$out/lib"
ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
find . -type f -perm +100 \ find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/lib:${gmp}/lib" {} \; --set-rpath "$out/lib:${gmp}/lib" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

2
pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
View file

@ -45,7 +45,7 @@ fi
rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli
# set all the dynamic linkers # set all the dynamic linkers
find $out -type f -perm +100 \ find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \; --set-rpath "$rpath" {} \;

2
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View file

@ -142,7 +142,7 @@ let result = stdenv.mkDerivation rec {
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture} rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}
# set all the dynamic linkers # set all the dynamic linkers
find $out -type f -perm +100 \ find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \; --set-rpath "$rpath" {} \;

2
pkgs/development/interpreters/ruby/bundler-head.nix
View file

@ -10,7 +10,7 @@ buildRubyGem {
}; };
dontPatchShebangs = true; dontPatchShebangs = true;
postInstall = '' postInstall = ''
find $out -type f -perm /0100 | while read f; do find $out -type f -perm -0100 | while read f; do
substituteInPlace $f \ substituteInPlace $f \
--replace "/usr/bin/env" "${coreutils}/bin/env" --replace "/usr/bin/env" "${coreutils}/bin/env"
done done

2
pkgs/development/interpreters/ruby/bundler.nix
View file

@ -6,7 +6,7 @@ buildRubyGem {
sha256 = "1vlzfq0bkkj4jyq6av0y55mh5nj5n0f3mfbmmifwgkh44g8k6agv"; sha256 = "1vlzfq0bkkj4jyq6av0y55mh5nj5n0f3mfbmmifwgkh44g8k6agv";
dontPatchShebangs = true; dontPatchShebangs = true;
postInstall = '' postInstall = ''
find $out -type f -perm /0100 | while read f; do find $out -type f -perm -0100 | while read f; do
substituteInPlace $f \ substituteInPlace $f \
--replace "/usr/bin/env" "${coreutils}/bin/env" --replace "/usr/bin/env" "${coreutils}/bin/env"
done done

6
pkgs/development/interpreters/ruby/config.nix
View file

@ -1,6 +1,8 @@
# Ruby >= 2.1.0 tries to download config.{guess,sub} # Ruby >= 2.1.0 tries to download config.{guess,sub}
fetchgit: fetchgit { { fetchFromSavannah }:
url = "git://git.sv.gnu.org/config.git";
fetchFromSavannah {
repo = "config";
rev = "576c839acca0e082e536fd27568b90a446ce5b96"; rev = "576c839acca0e082e536fd27568b90a446ce5b96";
sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0"; sha256 = "11bjngchjhj0qq0ppp8c37rfw0yhp230nvhs2jvlx15i9qbf56a0";
} }

4
pkgs/development/interpreters/ruby/ruby-2.1.0.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub { stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
, openssl, opensslSupport ? true , openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true , gdbm, gdbmSupport ? true
@ -13,7 +13,7 @@ let
op = stdenv.lib.optional; op = stdenv.lib.optional;
ops = stdenv.lib.optionals; ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit; config = import ./config.nix { inherit fetchFromSavannah; };
baseruby = ruby_2_1_0.override { useRailsExpress = false; }; baseruby = ruby_2_1_0.override { useRailsExpress = false; };
in in

4
pkgs/development/interpreters/ruby/ruby-2.1.1.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub { stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
, openssl, opensslSupport ? true , openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true , gdbm, gdbmSupport ? true
@ -13,7 +13,7 @@ let
op = stdenv.lib.optional; op = stdenv.lib.optional;
ops = stdenv.lib.optionals; ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit; config = import ./config.nix { inherit fetchFromSavannah; };
baseruby = ruby_2_1_1.override { useRailsExpress = false; }; baseruby = ruby_2_1_1.override { useRailsExpress = false; };
in in

4
pkgs/development/interpreters/ruby/ruby-2.1.2.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub { stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
, openssl, opensslSupport ? true , openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true , gdbm, gdbmSupport ? true
@ -13,7 +13,7 @@ let
op = stdenv.lib.optional; op = stdenv.lib.optional;
ops = stdenv.lib.optionals; ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit; config = import ./config.nix { inherit fetchFromSavannah; };
baseruby = ruby_2_1_2.override { useRailsExpress = false; }; baseruby = ruby_2_1_2.override { useRailsExpress = false; };
in in

4
pkgs/development/interpreters/ruby/ruby-2.1.3.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub { stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
, openssl, opensslSupport ? true , openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true , gdbm, gdbmSupport ? true
@ -13,7 +13,7 @@ let
op = stdenv.lib.optional; op = stdenv.lib.optional;
ops = stdenv.lib.optionals; ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit; config = import ./config.nix { inherit fetchFromSavannah; };
baseruby = ruby_2_1_3.override { useRailsExpress = false; }; baseruby = ruby_2_1_3.override { useRailsExpress = false; };
in in

8
pkgs/development/interpreters/ruby/ruby-2.1.6.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub { stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
, openssl, opensslSupport ? true , openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true , gdbm, gdbmSupport ? true
@ -7,13 +7,14 @@
, libyaml, yamlSupport ? true , libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true , libffi, fiddleSupport ? true
, ruby_2_1_6, autoreconfHook, bison, useRailsExpress ? true , ruby_2_1_6, autoreconfHook, bison, useRailsExpress ? true
, libiconv, libobjc, libunwind
}: }:
let let
op = stdenv.lib.optional; op = stdenv.lib.optional;
ops = stdenv.lib.optionals; ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit; config = import ./config.nix { inherit fetchFromSavannah; };
baseruby = ruby_2_1_6.override { useRailsExpress = false; }; baseruby = ruby_2_1_6.override { useRailsExpress = false; };
in in
@ -47,7 +48,8 @@ stdenv.mkDerivation rec {
# support is not enabled, so add readline to the build inputs if curses # support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're # support is disabled (if it's enabled, we already have it) and we're
# running on darwin # running on darwin
++ (op (!cursesSupport && stdenv.isDarwin) readline); ++ (op (!cursesSupport && stdenv.isDarwin) readline)
++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]);
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/interpreters/ruby/ruby-2.2.0.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub { stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
, openssl, opensslSupport ? true , openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true , gdbm, gdbmSupport ? true
@ -14,7 +14,7 @@ let
op = stdenv.lib.optional; op = stdenv.lib.optional;
ops = stdenv.lib.optionals; ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit; config = import ./config.nix { inherit fetchFromSavannah; };
baseruby = ruby_2_2_0.override { useRailsExpress = false; }; baseruby = ruby_2_2_0.override { useRailsExpress = false; };
in in

4
pkgs/development/interpreters/ruby/ruby-2.2.2.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub { stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub
, zlib, zlibSupport ? true , zlib, zlibSupport ? true
, openssl, opensslSupport ? true , openssl, opensslSupport ? true
, gdbm, gdbmSupport ? true , gdbm, gdbmSupport ? true
@ -14,7 +14,7 @@ let
op = stdenv.lib.optional; op = stdenv.lib.optional;
ops = stdenv.lib.optionals; ops = stdenv.lib.optionals;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix fetchgit; config = import ./config.nix { inherit fetchFromSavannah; };
baseruby = ruby_2_2_2.override { useRailsExpress = false; }; baseruby = ruby_2_2_2.override { useRailsExpress = false; };
in in

12
pkgs/development/libraries/audio/lvtk/default.nix
View file

@ -9,10 +9,18 @@ stdenv.mkDerivation rec {
sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd"; sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
}; };
buildInputs = [ boost gtkmm lv2 pkgconfig python ]; nativeBuildInputs = [ pkgconfig python ];
buildInputs = [ boost gtkmm lv2 ];
# Fix including the boost libraries during linking
postPatch = ''
sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build
'';
configurePhase = '' configurePhase = ''
python waf configure --prefix=$out --boost-includes="${boost.dev}/include" python waf configure --prefix=$out \
--boost-includes="${boost.dev}/include" \
--boost-libs="${boost.lib}/lib"
''; '';
buildPhase = "python waf"; buildPhase = "python waf";

40
pkgs/development/libraries/boost/1.59.nix Normal file
View file

@ -0,0 +1,40 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.59.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2";
sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";
};
patches = if stdenv.isCygwin then [
./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
./cygwin-fedora-boost-1.50.0-pool.patch
./cygwin-fedora-boost-1.57.0-mpl-print.patch
./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
./cygwin-fedora-boost-1.57.0-pool-test_linking.patch
./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
./cygwin-fedora-boost-1.57.0-uuid-comparison.patch
./cygwin-fedora-boost-1.57.0-move-is_class.patch
./cygwin-1.40.0-cstdint-cygwin.patch
./cygwin-1.57.0-asio-cygwin.patch
./cygwin-1.55.0-asio-MSG_EOR.patch
./cygwin-1.57.0-config-cygwin.patch
./cygwin-1.57.0-context-cygwin.patch
./cygwin-1.57.0-filesystem-cygwin.patch
./cygwin-1.55.0-interlocked-cygwin.patch
./cygwin-1.40.0-iostreams-cygwin.patch
./cygwin-1.57.0-locale-cygwin.patch
./cygwin-1.57.0-log-cygwin.patch
./cygwin-1.40.0-python-cygwin.patch
./cygwin-1.40.0-regex-cygwin.patch
./cygwin-1.57.0-smart_ptr-cygwin.patch
./cygwin-1.57.0-system-cygwin.patch
./cygwin-1.45.0-jam-cygwin.patch
./cygwin-1.50.0-jam-pep3149.patch
] else null;
})

9
pkgs/development/libraries/folly/default.nix
View file

@ -2,19 +2,18 @@
, google-gflags, python, libiberty, openssl }: , google-gflags, python, libiberty, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.52.0"; version = "0.57.0";
name = "folly-${version}"; name = "folly-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "folly"; repo = "folly";
rev = "v${version}"; rev = "v${version}";
sha256 = "16g3hpy1gy56zqnhwzkvzzpm6dgm01qa9yaigmrqr9b59c3k6cqf"; sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9";
}; };
buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ]; nativeBuildInputs = [ autoreconfHook python ];
buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
nativeBuildInputs = [ autoreconfHook python boost ];
postUnpack = "sourceRoot=\${sourceRoot}/folly"; postUnpack = "sourceRoot=\${sourceRoot}/folly";
preBuild = '' preBuild = ''

4
pkgs/development/libraries/gettext/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libiconv, xz }: { stdenv, fetchurl, libiconv, xz }:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "gettext-0.19.5.1"; name = "gettext-0.19.6";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gettext/${name}.tar.gz"; url = "mirror://gnu/gettext/${name}.tar.gz";
sha256 = "0cbp498ckjwj7qr8b9pmkry8hkhldgkvg5yix8hi9c8z1hxxb651"; sha256 = "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];

10
pkgs/development/libraries/libcdr/default.nix
View file

@ -1,17 +1,23 @@
{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }: { stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcdr-0.1.0"; name = "libcdr-0.1.1";
src = fetchurl { src = fetchurl {
url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2";
sha256 = "1l4glkyyxhzqq6j9n9cc01sf1q7xx8dd97cl3bwj8w4fp06ihv7g"; sha256 = "0javd72wmaqd6vprsh3clm393b3idjdjzbb7vyn44li7yaxppzkj";
}; };
buildInputs = [ libwpg libwpd lcms librevenge icu boost ]; buildInputs = [ libwpg libwpd lcms librevenge icu boost ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
# Boost 1.59 compatability fix
# Attempt removing when updating
postPatch = ''
sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
'';
configureFlags = if stdenv.cc.isClang configureFlags = if stdenv.cc.isClang
then [ "--disable-werror" ] else null; then [ "--disable-werror" ] else null;

8
pkgs/development/libraries/libe-book/default.nix
View file

@ -15,10 +15,16 @@ let
buildInputs = [ buildInputs = [
gperf pkgconfig librevenge libxml2 boost icu cppunit zlib gperf pkgconfig librevenge libxml2 boost icu cppunit zlib
]; ];
# Boost 1.59 compatability fix
# Attempt removing when updating
postPatch = ''
sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
'';
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; inherit (s) name version;
inherit buildInputs; inherit buildInputs postPatch;
src = fetchurl { src = fetchurl {
inherit (s) url sha256; inherit (s) url sha256;
}; };

7
pkgs/development/libraries/libgcrypt/default.nix
View file

@ -22,6 +22,13 @@ stdenv.mkDerivation rec {
sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la
''; '';
# TODO: figure out why this is even necessary and why the missing dylib only crashes
# random instead of every test
preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir -p $out/lib
cp src/.libs/libgcrypt.20.dylib $out/lib
'';
doCheck = true; doCheck = true;
meta = { meta = {

6
pkgs/development/libraries/librevenge/default.nix
View file

@ -26,6 +26,12 @@ stdenv.mkDerivation {
configureFlags = if stdenv.cc.isClang configureFlags = if stdenv.cc.isClang
then [ "--disable-werror" ] else null; then [ "--disable-werror" ] else null;
# Fix an issue with boost 1.59
# This is fixed upstream so please remove this when updating
postPatch = ''
sed -i 's,-DLIBREVENGE_BUILD,\0 -DBOOST_ERROR_CODE_HEADER_ONLY,g' src/lib/Makefile.in
'';
meta = { meta = {
inherit (s) version; inherit (s) version;
description = ''A base library for writing document import filters''; description = ''A base library for writing document import filters'';

4
pkgs/development/libraries/libtiff/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }: { stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
let let
version = "4.0.4beta"; version = "4.0.5";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libtiff-${version}"; name = "libtiff-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
[ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz"
"http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
]; ];
sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa"; sha256 = "171hgy4mylwmvdm7gp6ffjva81m4j56v3fbqsbfl7avzxn1slpp2";
}; };
outputs = [ "out" "doc" "man" ]; outputs = [ "out" "doc" "man" ];

10
pkgs/development/libraries/libunwind/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xz }: { stdenv, fetchurl, fetchpatch, xz }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libunwind-1.1"; name = "libunwind-1.1";
@ -8,7 +8,13 @@ stdenv.mkDerivation rec {
sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx"; sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
}; };
patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch ]; patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch
# https://lists.nongnu.org/archive/html/libunwind-devel/2014-04/msg00000.html
(fetchpatch {
url = "https://raw.githubusercontent.com/dropbox/pyston/1b2e676417b0f5f17526ece0ed840aa88c744145/libunwind_patches/0001-Change-the-RBP-validation-heuristic-to-allow-size-0-.patch";
sha256 = "1a0fsgfxmgd218nscswx7pgyb7rcn2gh6566252xhfvzhgn5i4ha";
})
];
postPatch = '' postPatch = ''
sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure

15
pkgs/development/libraries/libvisio/default.nix
View file

@ -3,17 +3,26 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libvisio-0.1.0"; name = "libvisio-0.1.3";
src = fetchurl { src = fetchurl {
url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2";
sha256 = "1vpb7nbk5qh6w3jz9rl9w8p25invcvj46parb9ld13h9777kyf0j"; sha256 = "1blgdwxprqkasm2175imcvy647sqv6xyf3k09p0b1i7hlq889wvy";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ]; buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ];
configureFlags = "--disable-werror"; # Boost 1.59 compatability fix
# Attempt removing when updating
postPatch = ''
sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
'';
configureFlags = [
"--disable-werror"
"--disable-tests"
];
meta = { meta = {
description = "A library providing ability to interpret and import visio diagrams into various applications"; description = "A library providing ability to interpret and import visio diagrams into various applications";

4
pkgs/development/libraries/mesa/default.nix
View file

@ -22,7 +22,7 @@ else
*/ */
let let
version = "10.6.5"; version = "10.6.7";
# this is the default search path for DRI drivers # this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in in
@ -36,7 +36,7 @@ stdenv.mkDerivation {
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
]; ];
sha256 = "fb6fac3c85bcfa9d06b8dd439169f23f0c0924a88e44362e738b99b1feff762f"; sha256 = "feb1f640b915dada88a7c793dfaff0ae23580f8903f87a6b76469253de0d28d8";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";

2
pkgs/development/libraries/ncbi/default.nix
View file

@ -40,7 +40,7 @@ rec {
cp ../make/makedis.csh $out/share/${name}/build-snapshot cp ../make/makedis.csh $out/share/${name}/build-snapshot
cp *.h $out/include cp *.h $out/include
cp *.c *.h $out/source cp *.c *.h $out/source
find . -perm +111 -a '(' '(' ! -name '*.*' ')' -o '(' -name '*.REAL' ')' ')' -exec cp '{}' $out/bin ';' find . -perm -0100 -a '(' '(' ! -name '*.*' ')' -o '(' -name '*.REAL' ')' ')' -exec cp '{}' $out/bin ';'
'') ["defEnsureDir" "build" "minInit"]; '') ["defEnsureDir" "build" "minInit"];
name = "NCBI-Toolbox-" + version; name = "NCBI-Toolbox-" + version;

4
pkgs/development/libraries/wtk/builder.sh
View file

@ -21,7 +21,7 @@ rpath=
for i in $libraries; do for i in $libraries; do
rpath=$rpath${rpath:+:}$i/lib rpath=$rpath${rpath:+:}$i/lib
done done
find $out -type f -perm +100 \ find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
find $out -type f -perm +100 \ find $out -type f -perm -0100 \
-exec patchelf --set-rpath "$rpath" {} \; -exec patchelf --set-rpath "$rpath" {} \;

2
pkgs/development/mobile/androidenv/androidndk.nix
View file

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
find $out \( \ find $out \( \
\( -type f -a -name "*.so*" \) -o \ \( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm /0100 \) \ \( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \
--set-rpath ${zlib}/lib:${ncurses}/lib {} \; --set-rpath ${zlib}/lib:${ncurses}/lib {} \;
# fix ineffective PROGDIR / MYNDKDIR determination # fix ineffective PROGDIR / MYNDKDIR determination

2
pkgs/development/mobile/androidenv/androidndk_r8e.nix
View file

@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
find $out \( \ find $out \( \
\( -type f -a -name "*.so*" \) -o \ \( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm /0100 \) \ \( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \
--set-rpath ${zlib}/lib:${ncurses}/lib {} \; --set-rpath ${zlib}/lib:${ncurses}/lib {} \;
# fix ineffective PROGDIR / MYNDKDIR determination # fix ineffective PROGDIR / MYNDKDIR determination

2
pkgs/development/python-modules/generic/wrap.sh
View file

@ -26,7 +26,7 @@ wrapPythonProgramsIn() {
done done
# Find all regular files in the output directory that are executable. # Find all regular files in the output directory that are executable.
for f in $(find "$dir" -type f -perm /0100); do for f in $(find "$dir" -type f -perm -0100); do
# Rewrite "#! .../env python" to "#! /nix/store/.../python". # Rewrite "#! .../env python" to "#! /nix/store/.../python".
if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then
sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^" sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^"

4
pkgs/development/tools/misc/help2man/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "help2man-1.47.1"; name = "help2man-1.47.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz"; url = "mirror://gnu/help2man/${name}.tar.xz";
sha256 = "01ib718afwc28bmh1n0p5h7245vs3rrfm7bj1sq4avmh1kv2d6y5"; sha256 = "0z1zgw6k1fba59fii6ksfi1g2gci6i4ysa3kdfh3j475fdkn1if4";
}; };
buildInputs = [ makeWrapper perl gettext LocaleGettext ]; buildInputs = [ makeWrapper perl gettext LocaleGettext ];

2
pkgs/development/tools/misc/patchelf/setup-hook.sh
View file

@ -9,7 +9,7 @@ patchELF() {
if [ -e "$prefix" ]; then if [ -e "$prefix" ]; then
find "$prefix" \( \ find "$prefix" \( \
\( -type f -a -name "*.so*" \) -o \ \( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm /0100 \) \ \( -type f -a -perm -0100 \) \
\) -print -exec patchelf --shrink-rpath '{}' \; \) -print -exec patchelf --shrink-rpath '{}' \;
fi fi
stopNest stopNest

3
pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
View file

@ -6,6 +6,7 @@ rec {
]; ];
IOKit = [ IOKit = [
"/System/Library/Frameworks/IOKit.framework" "/System/Library/Frameworks/IOKit.framework"
"/usr/lib/libenergytrace.dylib"
]; ];
DiskArbitration = [ DiskArbitration = [
"/System/Library/Frameworks/DiskArbitration.framework" "/System/Library/Frameworks/DiskArbitration.framework"
@ -30,6 +31,8 @@ rec {
"/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore" "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
"/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC" "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
"/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling" "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
"/usr/lib/libChineseTokenizer.dylib"
"/usr/lib/libmarisa.dylib"
"/usr/lib/libmecabra.dylib" "/usr/lib/libmecabra.dylib"
"/usr/lib/libcmph.dylib" "/usr/lib/libcmph.dylib"
"/usr/lib/libiconv.2.dylib" "/usr/lib/libiconv.2.dylib"

4
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
View file

@ -34,7 +34,9 @@ appleDerivation rec {
"system_platform" "system_platform"
"system_pthread" "system_pthread"
"system_sandbox" "system_sandbox"
"system_stats" # does not exist in El Capitan beta
# FIXME: does anything on yosemite actually need this?
# "system_stats"
"unc" "unc"
"unwind" "unwind"
"xpc" "xpc"

16
pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation {
name = "reattach-to-user-namespace-2.4";
src = fetchgit {
url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git";
sha256 = "1f9q1wxq764zidnx5hbdkbbyxxzfih0l0cjpgr0pxzwbmd2q6cvv";
rev = "2765aeab8f337c29e260a912bf4267a2732d8640";
};
buildFlags = "ARCHES=x86_64";
installPhase = ''
mkdir -p $out/bin
cp reattach-to-user-namespace $out/bin/
'';
}

4
pkgs/servers/http/mini-httpd/default.nix
View file

@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
# Fixes compat with boost 1.59
# Please attempt removing when updating
CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
meta = { meta = {
homepage = "http://mini-httpd.nongnu.org/"; homepage = "http://mini-httpd.nongnu.org/";
description = "a minimalistic high-performance web server"; description = "a minimalistic high-performance web server";

2
pkgs/servers/plex/default.nix
View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
done done
find $out/usr/lib/plexmediaserver/Resources -type f -a -perm /0100 \ find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \
-print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \; -print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \;

12
pkgs/servers/x11/xorg/default.nix
View file

@ -728,11 +728,11 @@ let
}) // {inherit fontconfig freetype libX11 xproto libXrender ;}; }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
libXi = (mkDerivation "libXi" { libXi = (mkDerivation "libXi" {
name = "libXi-1.7.4"; name = "libXi-1.7.5";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2; url = mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2;
sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc"; sha256 = "0ad21jy40d8b2f9ldadx7lkspmvka1i9r5jqqfwxdxyqnpgdfr6r";
}; };
buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
}) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
@ -928,11 +928,11 @@ let
}) // {inherit ;}; }) // {inherit ;};
libxcb = (mkDerivation "libxcb" { libxcb = (mkDerivation "libxcb" {
name = "libxcb-1.11"; name = "libxcb-1.11.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2; url = http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2;
sha256 = "1xqgc81krx14f2c8yl5chzg5g2l26mhm2rwffy8dx7jv0iq5sqq3"; sha256 = "0c4xyvdyx5adh8dzyhnrmvwwz24gri4z1czxmxqm63i0gmngs85p";
}; };
buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
}) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};

2
pkgs/servers/x11/xorg/extra.list
View file

@ -1,5 +1,5 @@
http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2 http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2
http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2

2
pkgs/servers/x11/xorg/overrides.nix
View file

@ -72,7 +72,7 @@ in
libxcb = attrs : attrs // { libxcb = attrs : attrs // {
nativeBuildInputs = [ args.python ]; nativeBuildInputs = [ args.python ];
configureFlags = "--enable-xkb"; configureFlags = "--enable-xkb --enable-xinput";
outputs = [ "out" "doc" "man" ]; outputs = [ "out" "doc" "man" ];
}; };

2
pkgs/servers/x11/xorg/tarballs-7.7.list
View file

@ -70,7 +70,7 @@ mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2

21
pkgs/shells/bash/bash-4.1-patches.nix
View file

@ -1,21 +0,0 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "0y02cbfnc5s3dnwr4fw2nz43f3b826f5084mk7qd0lzq12hpzr56")
(patch "002" "1y3qzw6lx16vnb8hrw3zx01z25k773cbmgysvs3vvcw6w6fj4bij")
(patch "003" "0v95ng8qa78dbh26rr6jpzkn3s6n78xymymkvvvkz35rpgfksxli")
(patch "004" "17pzykkywh5jmdy1ikj9xyxm7qm29ii2fmrfpyjr1wy16jx67h3q")
(patch "005" "06lwfgxx9kacz018nr4dmxqqrzipcg8pjn61gr6yfjv6s7c3k5ji")
(patch "006" "0j9c1zhhwvc2p4cdxi77nxmcxa00cimaxwbhasyqgc606g7sp1jr")
(patch "007" "19q5qba77hfda8g4xylh77awiakhr1d1asgbqcrbakxs50n2l0bl")
(patch "008" "058j911q9wcbr93w59jnpgmdpx4qsq3gvd6m9nwgdk9j2hjjqb2f")
(patch "009" "1lany70f0rx1i2xikzkahr1zskh8620j05ic0gc5x2p89ab0ch5x")
(patch "010" "05fqv7w12g9izy332wypynilgxzdh87vy5q2pqq3bjdncyl5hxvr")
(patch "011" "088n54yh5zp8aa917y1ng3802amchgal1acn0v0mdjqj0yi82aqv")
(patch "012" "0vbvc1vxljyd882wk6rcd64xrf1lda6wirys41mqjbl0lalj8bi7")
(patch "013" "1y7x62i0q3wkr9jdjzvm2rl9dp11vzp8fwkz2zb2x21l0pi25mya")
(patch "014" "0gpizgbx1w712awpd11x5nvahpranl0aiq16nhp3xmm8vvz1wpar")
(patch "015" "17nf6kw1vhmzn9nzb1vyn8r4wp2nl109f9yawzavjkf06670ln7c")
(patch "016" "129hknigxhxrh1rbjhc4fm6argpjb6lp9fl616narbnzsv3qhc3l")
(patch "017" "0vy02x6fmpd6i66n97r4fwrq9pncbgzya07iyca2bb6yyzmymgg5")
]

3
pkgs/shells/bash/bash-4.3-patches.nix
View file

@ -40,4 +40,7 @@ patch: [
(patch "037" "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k") (patch "037" "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k")
(patch "038" "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd") (patch "038" "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd")
(patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b") (patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b")
(patch "040" "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4")
(patch "041" "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f")
(patch "042" "1bwhssay66n75fy0pxcrwbm032s6fvfg7dblzbrzzn5k38a56nmp")
] ]

2
pkgs/stdenv/pure-darwin/default.nix
View file

@ -32,7 +32,7 @@ let
mkdir = fetch { file = "mkdir"; sha256 = "1yfl8w65ksji7fggrbvqxw8lp0gm02qilk11n9axj2jxay53ngvg"; }; mkdir = fetch { file = "mkdir"; sha256 = "1yfl8w65ksji7fggrbvqxw8lp0gm02qilk11n9axj2jxay53ngvg"; };
cpio = fetch { file = "cpio"; sha256 = "0nssyg19smgcblwq1mfcw4djbd85md84d2f093qcqkbigdjg484b"; }; cpio = fetch { file = "cpio"; sha256 = "0nssyg19smgcblwq1mfcw4djbd85md84d2f093qcqkbigdjg484b"; };
}; };
tarball = fetch { file = "bootstrap-tools.9.cpio.bz2"; sha256 = "0fd79k7gy3z3sba5w4f4lnrcpiwff31vw02480x1pdry8bbgbf2j"; }; tarball = fetch { file = "bootstrap-tools.9.cpio.bz2"; sha256 = "1xim0wm4ld45ysdmgpsa6b1f6srdnfj054ilv86k0pa5plvcmsf4"; };
in rec { in rec {
allPackages = import ../../top-level/all-packages.nix; allPackages = import ../../top-level/all-packages.nix;

2
pkgs/tools/graphics/quirc/default.nix
View file

@ -26,7 +26,7 @@ stdenv.mkDerivation {
''; '';
preInstall = '' preInstall = ''
mkdir -p "$out"/{bin,lib,include} mkdir -p "$out"/{bin,lib,include}
find . -maxdepth 1 -type f -perm +111 -exec cp '{}' "$out"/bin ';' find . -maxdepth 1 -type f -perm -0100 -exec cp '{}' "$out"/bin ';'
''; '';
makeFlags = "PREFIX=$(out)"; makeFlags = "PREFIX=$(out)";
meta = { meta = {

4
pkgs/tools/networking/curl/default.nix
View file

@ -16,11 +16,11 @@ assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null; assert c-aresSupport -> c-ares != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curl-7.43.0"; name = "curl-7.44.0";
src = fetchurl { src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2"; url = "http://curl.haxx.se/download/${name}.tar.bz2";
sha256 = "1ycdhp47v8z6y64s7ihi5jl28dzc5w8wqn0wrhy4hc152ahm99ms"; sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y";
}; };
# Zlib and OpenSSL must be propagated because `libcurl.la' contains # Zlib and OpenSSL must be propagated because `libcurl.la' contains

13
pkgs/top-level/all-packages.nix
View file

@ -617,6 +617,8 @@ let
derez = callPackage ../os-specific/darwin/derez { }; derez = callPackage ../os-specific/darwin/derez { };
rez = callPackage ../os-specific/darwin/rez { }; rez = callPackage ../os-specific/darwin/rez { };
reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
setfile = callPackage ../os-specific/darwin/setfile { }; setfile = callPackage ../os-specific/darwin/setfile { };
install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };
@ -5071,7 +5073,9 @@ let
ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { }; ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { };
ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { }; ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { };
ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { }; ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { };
ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { }; ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix {
inherit (darwin) libobjc libunwind;
};
ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix {
inherit (darwin) libobjc libunwind; inherit (darwin) libobjc libunwind;
}; };
@ -5889,7 +5893,8 @@ let
boost156 = callPackage ../development/libraries/boost/1.56.nix { }; boost156 = callPackage ../development/libraries/boost/1.56.nix { };
boost157 = callPackage ../development/libraries/boost/1.57.nix { }; boost157 = callPackage ../development/libraries/boost/1.57.nix { };
boost158 = callPackage ../development/libraries/boost/1.58.nix { }; boost158 = callPackage ../development/libraries/boost/1.58.nix { };
boost = boost158; boost159 = callPackage ../development/libraries/boost/1.59.nix { };
boost = boost159;
boost_process = callPackage ../development/libraries/boost-process { }; boost_process = callPackage ../development/libraries/boost-process { };
@ -6164,7 +6169,9 @@ let
fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {};
folly = callPackage ../development/libraries/folly { }; folly = callPackage ../development/libraries/folly {
boost = boost157;
};
makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { callPackage ../development/libraries/fontconfig/make-fonts-conf.nix {