mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 04:57:56 +03:00
* Sync with the trunk. Remove glib_2_28 because the branch already
has it. svn path=/nixpkgs/branches/x-updates/; revision=26189
This commit is contained in:
commit
f16a2dc2f6
@ -277,18 +277,27 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \
|
||||
"--strict" "--eval-only" "--xml"
|
||||
script)))
|
||||
|
||||
(define (pipe-failed? pipe)
|
||||
"Close pipe and return its status if it failed."
|
||||
(let ((status (close-pipe pipe)))
|
||||
(if (or (status:term-sig status)
|
||||
(not (= (status:exit-val status) 0)))
|
||||
status
|
||||
#f)))
|
||||
|
||||
(define (nix-prefetch-url url)
|
||||
;; Download URL in the Nix store and return the base32-encoded SHA256 hash
|
||||
;; of the file at URL
|
||||
(let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
|
||||
(hash (read-line pipe)))
|
||||
(close-pipe pipe)
|
||||
(if (eof-object? hash)
|
||||
(if (or (pipe-failed? pipe)
|
||||
(eof-object? hash))
|
||||
(values #f #f)
|
||||
(let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
|
||||
"sha256" hash (basename url)))
|
||||
"sha256" hash (basename url)))
|
||||
(path (read-line pipe)))
|
||||
(if (eof-object? path)
|
||||
(if (or (pipe-failed? pipe)
|
||||
(eof-object? path))
|
||||
(values #f #f)
|
||||
(values (string-trim-both hash) (string-trim-both path)))))))
|
||||
|
||||
@ -815,20 +824,31 @@ pairs. Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
|
||||
|
||||
(define (gnupdate . args)
|
||||
;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
|
||||
|
||||
(define (nixpkgs->snix xml-file)
|
||||
(format (current-error-port) "evaluating Nixpkgs...~%")
|
||||
(let* ((home (getenv "HOME"))
|
||||
(xml (if xml-file
|
||||
(open-input-file xml-file)
|
||||
(open-nixpkgs (or (getenv "NIXPKGS")
|
||||
(string-append home "/src/nixpkgs")))))
|
||||
(snix (xml->snix xml)))
|
||||
(if (not xml-file)
|
||||
(let ((status (pipe-failed? xml)))
|
||||
(if status
|
||||
(begin
|
||||
(format (current-error-port) "`nix-instantiate' failed: ~A~%"
|
||||
status)
|
||||
(exit 1)))))
|
||||
snix))
|
||||
|
||||
(let* ((opts (args-fold (cdr args) %options
|
||||
(lambda (opt name arg result)
|
||||
(error "unrecognized option `~A'" name))
|
||||
(lambda (operand result)
|
||||
(error "extraneous argument `~A'" operand))
|
||||
'()))
|
||||
(home (getenv "HOME"))
|
||||
(path (or (getenv "NIXPKGS")
|
||||
(string-append home "/src/nixpkgs")))
|
||||
(snix (begin
|
||||
(format (current-error-port) "parsing XML...~%")
|
||||
(xml->snix
|
||||
(or (and=> (assoc-ref opts 'xml-file) open-input-file)
|
||||
(open-nixpkgs path)))))
|
||||
(snix (nixpkgs->snix (assoc-ref opts 'xml-file)))
|
||||
(packages (match snix
|
||||
(('snix _ ('attribute-set attributes))
|
||||
attributes)
|
||||
|
55
pkgs/applications/graphics/freecad/cmakeinstall.patch
Normal file
55
pkgs/applications/graphics/freecad/cmakeinstall.patch
Normal file
@ -0,0 +1,55 @@
|
||||
Index: src/3rdParty/salomesmesh/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/src/3rdParty/salomesmesh/CMakeLists.txt (revision 4193)
|
||||
+++ a/src/3rdParty/salomesmesh/CMakeLists.txt (working copy)
|
||||
@@ -191,7 +191,7 @@
|
||||
INCLUDE_DIRECTORIES(src/StdMeshers)
|
||||
|
||||
ADD_LIBRARY(StdMeshers SHARED ${StdMeshers_source_files})
|
||||
-TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c)
|
||||
+TARGET_LINK_LIBRARIES(StdMeshers SMESH TKernel TKMath TKAdvTools f2c gfortran)
|
||||
SET(StdMeshers_CFLAGS "")
|
||||
IF(WIN32)
|
||||
SET(StdMeshers_CFLAGS "-DSTDMESHERS_EXPORTS -DMEFISTO2D_EXPORTS")
|
||||
@@ -218,9 +218,9 @@
|
||||
# Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7
|
||||
INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV
|
||||
SMESHDS SMESH StdMeshers
|
||||
- DESTINATION /usr/local/lib/${INSTALL_PATH_NAME})
|
||||
+ DESTINATION lib)
|
||||
# Headers are installed by default in /usr/local/include/SMESH-5.1.2.7
|
||||
INSTALL(DIRECTORY inc/
|
||||
- DESTINATION /usr/local/include/${INSTALL_PATH_NAME}
|
||||
+ DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.h*")
|
||||
ENDIF(UNIX)
|
||||
Index: src/3rdParty/Pivy-0.5/CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/src/3rdParty/Pivy-0.5/CMakeLists.txt (revision 4193)
|
||||
+++ a/src/3rdParty/Pivy-0.5/CMakeLists.txt (working copy)
|
||||
@@ -56,6 +56,7 @@
|
||||
set_target_properties(coin PROPERTIES OUTPUT_NAME "_coin")
|
||||
set_target_properties(coin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy)
|
||||
set_target_properties(coin PROPERTIES PREFIX "")
|
||||
+ install(TARGETS coin DESTINATION bin/pivy)
|
||||
endif(MSVC)
|
||||
|
||||
fc_copy_sources_outpath("bin/pivy" "coin"
|
||||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- a/CMakeLists.txt (revision 4193)
|
||||
+++ a/CMakeLists.txt (working copy)
|
||||
@@ -57,13 +57,6 @@
|
||||
|
||||
# ================================================================================
|
||||
|
||||
-
|
||||
-if(WIN32)
|
||||
- SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
|
||||
-else(WIN32)
|
||||
- SET(CMAKE_INSTALL_PREFIX "/usr/lib/freecad")
|
||||
-endif(WIN32)
|
||||
-
|
||||
# ================================================================================
|
||||
# == Win32 is default behaviour use the LibPack copied in Source tree ============
|
||||
if(MSVC)
|
@ -1,45 +1,47 @@
|
||||
{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
|
||||
{ fetchsvn, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
|
||||
boost, zlib,
|
||||
python, swig, gfortran, soqt, autoconf, automake, libtool }:
|
||||
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
|
||||
|
||||
throw "It does not build still"
|
||||
# It builds but fails to install
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "freecad-${version}";
|
||||
version = "0.11.3729";
|
||||
version = "svn-${src.rev}";
|
||||
|
||||
src = fetchurl {
|
||||
/*
|
||||
url = "mirror://sourceforge/free-cad/freecad-${version}.tar.gz";
|
||||
sha256 = "0q9jhnhkjsq9iy4kqi4xh2ljack4b2jj4pjm4dylv4z2d9gg5p4l";
|
||||
*/
|
||||
url = "mirror://sourceforge/free-cad/freecad-${version}.dfsg.tar.gz";
|
||||
sha256 = "0sjcbadzzgdjr5bk51nr3nq0siyvfdq0913dqlhv9xr42vha3j8r";
|
||||
src = fetchsvn {
|
||||
url = https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk;
|
||||
rev = "4184";
|
||||
sha256 = "26bd8407ce38f070b81ef39145aed093eed3c200d165a605b8169162d66568ce";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
|
||||
zlib python swig gfortran soqt /*autoconf automake libtool*/ ];
|
||||
zlib python swig gfortran soqt libf2c pyqt4 makeWrapper ];
|
||||
|
||||
/*
|
||||
# Using autotools
|
||||
patchPhase = ''
|
||||
sed -i -e 's/boost_\([a-z_]\+\)-mt/boost_\1/' \
|
||||
configure
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# The freecad people are used to boost 1.42, and we have newer boost that
|
||||
# require the -DBOOST_FILESYSTEM_VERSION=2 for freecad to build
|
||||
# For zlib to build in i686-linux, as g++ plus glibc defines _LARGEFILE64_SOURCE,
|
||||
# we need the -D-FILE_OFFSET_BITS=64 indication for zlib headers to work.
|
||||
NIX_CFLAGS_COMPILE = "-DBOOST_FILESYSTEM_VERSION=2 -D_FILE_OFFSET_BITS=64";
|
||||
|
||||
# This should work on both x86_64, and i686 linux
|
||||
preBuild = ''
|
||||
export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS";
|
||||
'';
|
||||
|
||||
configureFlags = [ "--with-eigen2-include=${eigen}/include/eigen2"
|
||||
"--with-boost-include=${boost}/include"
|
||||
"--with-boost-lib=${boost}/lib"
|
||||
"--with-qt4-dir=${qt4}"
|
||||
];
|
||||
*/
|
||||
|
||||
# Using cmake
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e '/Idf/d' -e '/Start/d' src/Mod/CMakeLists.txt
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/FreeCAD --prefix PYTHONPATH : $PYTHONPATH \
|
||||
--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
|
||||
'';
|
||||
|
||||
cmakeFlags = [ "-Wno-dev" ];
|
||||
patches = [ ./cmakeinstall.patch ./pythonpath.patch ];
|
||||
|
||||
meta = {
|
||||
homepage = http://free-cad.sourceforge.net/;
|
||||
license = [ "GPLv2+" "LGPLv2+" ];
|
||||
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
19
pkgs/applications/graphics/freecad/pythonpath.patch
Normal file
19
pkgs/applications/graphics/freecad/pythonpath.patch
Normal file
@ -0,0 +1,19 @@
|
||||
http://sourceforge.net/apps/phpbb/free-cad/viewtopic.php?f=4&t=847&p=6364
|
||||
|
||||
Index: src/Main/MainGui.cpp
|
||||
===================================================================
|
||||
--- a/src/Main/MainGui.cpp (revision 4193)
|
||||
+++ a/src/Main/MainGui.cpp (working copy)
|
||||
@@ -149,10 +149,10 @@
|
||||
// http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846
|
||||
putenv("LANG=C");
|
||||
putenv("LC_ALL=C");
|
||||
- putenv("PYTHONPATH=");
|
||||
+ //putenv("PYTHONPATH=");
|
||||
#else
|
||||
setlocale(LC_NUMERIC, "C");
|
||||
- _putenv("PYTHONPATH=");
|
||||
+ //_putenv("PYTHONPATH=");
|
||||
#endif
|
||||
|
||||
// Name and Version of the Application
|
@ -12,14 +12,14 @@
|
||||
|
||||
rec {
|
||||
|
||||
firefoxVersion = "3.6.13";
|
||||
firefoxVersion = "3.6.14";
|
||||
|
||||
xulVersion = "1.9.2.13"; # this attribute is used by other packages
|
||||
xulVersion = "1.9.2.14"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha1 = "1d1bc70d651bce4006687f5762638563c0494267";
|
||||
sha1 = "8f4e221951f74366619473bd46e04b4c81606ef0";
|
||||
};
|
||||
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, zlib, openssl, tcl}:
|
||||
|
||||
let
|
||||
version = "20110113000127907";
|
||||
version = "20110301190432";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
|
||||
sha256 = "112jwz02mj44qg2xd2b45i0ff6v106649g681p34k20ngi9qqghm";
|
||||
sha256 = "1dvccfqyrxihsj376m2dk4ygrajk8nlrp9di5s49azv0vkzrpp38";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
|
@ -2,10 +2,6 @@ source $stdenv/setup
|
||||
|
||||
source $mirrorsFile
|
||||
|
||||
if test -n "$showURLs"; then
|
||||
header "downloading file $name with $outputHashAlgo hash $outputHash..."
|
||||
fi
|
||||
|
||||
|
||||
# Curl flags to handle redirects, not use EPSV, handle cookies for
|
||||
# servers to need them during redirects, and work on SSL without a
|
||||
|
@ -1,11 +1,11 @@
|
||||
{stdenv, fetchurl, SDL} :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "SDL_gfx-2.0.20";
|
||||
name = "SDL_gfx-2.0.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
|
||||
sha256 = "0dyc1sj0ymv2ghmlgwfb2c6r07scbgmi2dfhmnddsb27y8wjqz4q";
|
||||
sha256 = "1w1bdpyypvqg1nmbjwkqnjhmngvpjmhc0zanwgq7z4pxffzffx8m";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL ] ;
|
||||
|
80
pkgs/development/libraries/boost/1.46.nix
Normal file
80
pkgs/development/libraries/boost/1.46.nix
Normal file
@ -0,0 +1,80 @@
|
||||
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
|
||||
, enableRelease ? true
|
||||
, enableDebug ? false
|
||||
, enableSingleThreaded ? false
|
||||
, enableMultiThreaded ? true
|
||||
, enableShared ? true
|
||||
, enableStatic ? false
|
||||
, enablePIC ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
variant = stdenv.lib.concatStringsSep ","
|
||||
(stdenv.lib.optional enableRelease "release" ++
|
||||
stdenv.lib.optional enableDebug "debug");
|
||||
|
||||
threading = stdenv.lib.concatStringsSep ","
|
||||
(stdenv.lib.optional enableSingleThreaded "single" ++
|
||||
stdenv.lib.optional enableMultiThreaded "multi");
|
||||
|
||||
link = stdenv.lib.concatStringsSep ","
|
||||
(stdenv.lib.optional enableShared "shared" ++
|
||||
stdenv.lib.optional enableStatic "static");
|
||||
|
||||
# To avoid library name collisions
|
||||
finalLayout = if ((enableRelease && enableDebug) ||
|
||||
(enableSingleThreaded && enableMultiThreaded) ||
|
||||
(enableShared && enableStatic)) then
|
||||
"tagged" else "system";
|
||||
|
||||
cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else "";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "boost-1.46.0";
|
||||
|
||||
meta = {
|
||||
homepage = "http://boost.org/";
|
||||
description = "Boost C++ Library Collection";
|
||||
license = "boost-license";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_46_0.tar.bz2";
|
||||
sha256 = "0ndsiv06332gbh6wj68pcnci3l5qrc5pm1ca9dkmxhpxj83zd41g";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [icu expat zlib bzip2 python];
|
||||
|
||||
configureScript = "./bootstrap.sh";
|
||||
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
|
||||
|
||||
buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
|
||||
|
||||
installPhase = ":";
|
||||
|
||||
crossAttrs = rec {
|
||||
buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
|
||||
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
|
||||
# override them.
|
||||
propagatedBuildInputs = buildInputs;
|
||||
# We want to substitute the contents of configureFlags, removing thus the
|
||||
# usual --build and --host added on cross building.
|
||||
preConfigure = ''
|
||||
export configureFlags="--prefix=$out --without-icu"
|
||||
'';
|
||||
buildPhase = ''
|
||||
set -x
|
||||
cat << EOF > user-config.jam
|
||||
using gcc : cross : $crossConfig-g++ ;
|
||||
EOF
|
||||
./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
|
||||
'';
|
||||
};
|
||||
}
|
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
src = fetchurl {
|
||||
url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
|
||||
name = "eigen-${v}.tar.bz2";
|
||||
sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79";
|
||||
sha256 = "0frgmkwsgmqaw88qpgvfalisq0wjpcbgqbj6jhpk39nbrs3zcq83";
|
||||
};
|
||||
buildNativeInputs = [ cmake ];
|
||||
meta = with stdenv.lib; {
|
||||
|
32
pkgs/development/libraries/libf2c/default.nix
Normal file
32
pkgs/development/libraries/libf2c/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{stdenv, fetchurl, unzip}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libf2c";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.netlib.org/f2c/libf2c.zip;
|
||||
sha256 = "14py0zdwzj5gqjzi0z2hlcy3czpzx1fav55akdj143qgav8h6dav";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir build
|
||||
cd build
|
||||
unzip ${src}
|
||||
'';
|
||||
|
||||
makeFlags = "-f makefile.u";
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/include $out/lib
|
||||
cp libf2c.a $out/lib
|
||||
cp f2c.h $out/include
|
||||
'';
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
meta = {
|
||||
description = "F2c converts Fortran 77 source code to C";
|
||||
homepage = http://www.netlib.org/f2c/;
|
||||
license = "BSD";
|
||||
};
|
||||
}
|
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "PyQt-x11-gpl-4.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz";
|
||||
url = "http://nixos.org/tarballs/${name}.tar.gz";
|
||||
sha256 = "0w7k1jz7wcfwqq77hiwgds5s6py7kkg1rszd6c94bk9dr06vishz";
|
||||
};
|
||||
|
||||
|
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
name = "sip-4.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";
|
||||
url = "http://nixos.org/tarballs/${name}.tar.gz";
|
||||
sha256 = "0g1pj203m491rhy111ayr4k4lsbcqd8sa1np503xv94a90b05l6f";
|
||||
};
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
x@{builderDefsPackage
|
||||
, foomatic_filters, bc, unzip, ghostscript
|
||||
, foomatic_filters, bc, unzip, ghostscript, udev, vim
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
@ -11,10 +11,10 @@ let
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="foo2zjs";
|
||||
version="20090908";
|
||||
version="20110210";
|
||||
name="${baseName}-${version}";
|
||||
url="http://ftp.de.debian.org/debian/pool/main/f/foo2zjs/foo2zjs_${version}dfsg.orig.tar.gz";
|
||||
hash="1pg4dmckvlx94zxh4gcw7jfmyb10ada7f6vsp5bgz1z95fwwlqjz";
|
||||
url="http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz";
|
||||
hash="0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
@ -26,15 +26,36 @@ rec {
|
||||
inherit (sourceInfo) name version;
|
||||
inherit buildInputs;
|
||||
|
||||
phaseNames = ["fixMakefile" "doMakeInstall" "deployGetWeb"];
|
||||
phaseNames = ["doPatch" "fixHardcodedPaths" "doMakeDirs" "doMakeInstall" "deployGetWeb"];
|
||||
|
||||
patches = [ ./no-hardcode-fw.diff ];
|
||||
|
||||
makeFlags = [
|
||||
''PREFIX=$out/''
|
||||
''UDEVBIN=$out/bin/''
|
||||
''PREFIX=$out''
|
||||
''UDEVBIN=$out/bin''
|
||||
''UDEVDIR=$out/etc/udev/rules.d''
|
||||
''UDEVD=${udev}/sbin/udevd''
|
||||
''LIBUDEVDIR=$out/lib/udev/rules.d''
|
||||
''USBDIR=$out/etc/hotplug/usb''
|
||||
''FOODB=$out/share/foomatic/db/source''
|
||||
''MODEL=$out/share/cups/model''
|
||||
];
|
||||
fixMakefile = a.fullDepEntry ''
|
||||
|
||||
installFlags = [ "install-hotplug" ];
|
||||
|
||||
fixHardcodedPaths = a.fullDepEntry ''
|
||||
touch all-test
|
||||
sed -e "/BASENAME=/iPATH=$out/bin:$PATH" -i *-wrapper *-wrapper.in
|
||||
'' ["doUnpack" "minInit"];
|
||||
sed -e '/install-usermap/d' -i Makefile
|
||||
sed -e "s@/etc/hotplug/usb@$out&@" -i *rules*
|
||||
sed -e "/PRINTERID=/s@=.*@=$out/bin/usb_printerid@" -i hplj1000
|
||||
'' ["doPatch" "minInit"];
|
||||
|
||||
doMakeDirs = a.fullDepEntry ''
|
||||
mkdir -pv $out/{etc/udev/rules.d,lib/udev/rules.d,etc/hotplug/usb}
|
||||
mkdir -pv $out/share/foomatic/db/source/{opt,printer,driver}
|
||||
mkdir -pv $out/share/cups/model
|
||||
'' ["minInit"];
|
||||
|
||||
deployGetWeb = a.fullDepEntry ''
|
||||
ensureDir "$out/bin"
|
||||
|
98
pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
Normal file
98
pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
Normal file
@ -0,0 +1,98 @@
|
||||
#
|
||||
#
|
||||
# patch "hplj1000"
|
||||
# from [d5336e74866d31735d97874191351a0dcc092b44]
|
||||
# to [55102b37684ee5181674d19d866caec2cf603412]
|
||||
#
|
||||
============================================================
|
||||
--- a/hplj1000 d5336e74866d31735d97874191351a0dcc092b44
|
||||
+++ b/hplj1000 55102b37684ee5181674d19d866caec2cf603412
|
||||
@@ -39,11 +39,6 @@ DEV=""
|
||||
DEV=""
|
||||
|
||||
#
|
||||
-# Directory to find downloadable HP firmware files sihpMMMM.dl
|
||||
-#
|
||||
-FWDIR=/usr/share/foo2zjs/firmware
|
||||
-
|
||||
-#
|
||||
# Program used to determine USB printer id information
|
||||
#
|
||||
# NOTE: /usr/bin is NOT mounted at this point
|
||||
@@ -83,57 +78,61 @@ case "$0" in
|
||||
MODEL=P1005; FWMODEL=$MODEL
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x3d17 #Model
|
||||
- FWDIR=/usr/share/foo2xqx/firmware
|
||||
+ DRIVER=foo2xqx
|
||||
;;
|
||||
*P1006)
|
||||
MODEL=P1006; FWMODEL=$MODEL
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x3e17 #Model
|
||||
- FWDIR=/usr/share/foo2xqx/firmware
|
||||
+ DRIVER=foo2xqx
|
||||
;;
|
||||
*P1007)
|
||||
MODEL=P1007; FWMODEL=P1005 # Alias
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x4817 #Model
|
||||
- FWDIR=/usr/share/foo2xqx/firmware
|
||||
+ DRIVER=foo2xqx
|
||||
;;
|
||||
*P1008)
|
||||
MODEL=P1008; FWMODEL=P1006 # Alias
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x4917 #Model
|
||||
- FWDIR=/usr/share/foo2xqx/firmware
|
||||
+ DRIVER=foo2xqx
|
||||
;;
|
||||
*P1505)
|
||||
MODEL=P1505; FWMODEL=$MODEL
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x3f17 #Model
|
||||
- FWDIR=/usr/share/foo2xqx/firmware
|
||||
+ DRIVER=foo2xqx
|
||||
;;
|
||||
*P1505n)
|
||||
MODEL=P1505n; FWMODEL=$MODEL
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x4017 #Model
|
||||
- FWDIR=/usr/share/foo2xqx/firmware
|
||||
+ DRIVER=foo2xqx
|
||||
;;
|
||||
*1000)
|
||||
MODEL=1000; FWMODEL=$MODEL
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x0517 #Model
|
||||
+ DRIVER=foo2zjs
|
||||
;;
|
||||
*1005)
|
||||
MODEL=1005; FWMODEL=$MODEL
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x1317 #Model
|
||||
+ DRIVER=foo2zjs
|
||||
;;
|
||||
*1018)
|
||||
MODEL=1018; FWMODEL=$MODEL
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x4117 #Model
|
||||
+ DRIVER=foo2zjs
|
||||
;;
|
||||
*1020)
|
||||
MODEL=1020; FWMODEL=$MODEL
|
||||
USB1=0x03f0 #Vendor
|
||||
USB2=0x2b17 #Model
|
||||
+ DRIVER=foo2zjs
|
||||
;;
|
||||
*)
|
||||
log "Only HP LaserJet 100[05],1018,1020,P100[5678],P1505 are supported"
|
||||
@@ -203,7 +202,7 @@ load1() {
|
||||
#
|
||||
load1() {
|
||||
_dev="$1"
|
||||
- fw="$FWDIR/sihp$FWMODEL.dl"
|
||||
+ fw="${FOO2ZJS_DATADIR:-/usr/share}/$DRIVER/firmware/sihp$FWMODEL.dl"
|
||||
if [ ! -f "$fw" ]; then
|
||||
log "Missing HP LaserJet $MODEL firmware file $fw"
|
||||
log "...read foo2zjs installation instructions and run ./getweb $MODEL"
|
@ -1,13 +1,13 @@
|
||||
{stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus, pkgconfig
|
||||
, qtSupport ? false, qt4
|
||||
{stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus
|
||||
, pkgconfig, polkit, qtSupport ? false, qt4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "hplip-3.10.5";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hplip-3.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://prdownloads.sourceforge.net/hplip/hplip-3.10.5.tar.gz";
|
||||
sha256 = "1lyl9nrdaih64cqw6fa7ivjf7a74bq8zn0gkj1gap47b04my608p";
|
||||
url = "mirror://sourceforge/hplip/${name}.tar.gz";
|
||||
sha256 = "0y68s4xm5d0kv7p5j41qq0xglp4vdbjwbrjs89b4a21wwn69hp9g";
|
||||
};
|
||||
|
||||
#preBuild=''
|
||||
@ -27,12 +27,16 @@ stdenv.mkDerivation {
|
||||
--with-icondir=$out/share/applications
|
||||
--with-systraydir=$out/xdg/autostart
|
||||
--with-mimedir=$out/etc/cups
|
||||
--enable-policykit
|
||||
--disable-network-build"
|
||||
|
||||
export makeFlags="
|
||||
halpredir=$out/share/hal/fdi/preprobe/10osvendor
|
||||
hplip_statedir=$out/var
|
||||
rulesdir=$out/etc/udev/rules.d
|
||||
policykit_dir=$out/share/polkit-1/actions
|
||||
policykit_dbus_etcdir=$out/etc/dbus-1/system.d
|
||||
policykit_dbus_sharedir=$out/share/dbus-1/system-services
|
||||
hplip_confdir=$out/etc/hp
|
||||
";
|
||||
'';
|
||||
|
@ -198,11 +198,11 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "2.6.32.29";
|
||||
version = "2.6.32.31";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-${version}.tar.bz2";
|
||||
sha256 = "1xwsmrlnhla8k612lz3jq9bl4c3b620m4pr74gv0rwsiksmh2l6c";
|
||||
sha256 = "1fr0by6aqv9vxglll85kbwjwfj2j6inbikybij3mg70sadq09idh";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
@ -224,10 +224,4 @@ in
|
||||
patch = ./guruplug-mach-type.patch;
|
||||
};
|
||||
|
||||
xen_pvclock_resume =
|
||||
{ # Fix the clock after a DomU restore following a Dom0 reboot or migration.
|
||||
name = "xen-pvclock-resume";
|
||||
patch = ./xen-pvclock-resume.patch;
|
||||
};
|
||||
|
||||
}
|
||||
|
@ -1,51 +0,0 @@
|
||||
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
|
||||
Date: Mon, 25 Oct 2010 16:53:46 -0700
|
||||
Subject: [PATCH] x86/pvclock: zero last_value on resume
|
||||
|
||||
If the guest domain has been suspend/resumed or migrated, then the
|
||||
system clock backing the pvclock clocksource may revert to a smaller
|
||||
value (ie, can be non-monotonic across the migration/save-restore).
|
||||
Make sure we zero last_value in that case so that the domain
|
||||
continues to see clock updates.
|
||||
|
||||
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
|
||||
|
||||
diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h
|
||||
index cd02f32..6226870 100644
|
||||
--- a/arch/x86/include/asm/pvclock.h
|
||||
+++ b/arch/x86/include/asm/pvclock.h
|
||||
@@ -11,5 +11,6 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src);
|
||||
void pvclock_read_wallclock(struct pvclock_wall_clock *wall,
|
||||
struct pvclock_vcpu_time_info *vcpu,
|
||||
struct timespec *ts);
|
||||
+void pvclock_resume(void);
|
||||
|
||||
#endif /* _ASM_X86_PVCLOCK_H */
|
||||
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
|
||||
index 239427c..a4f07c1 100644
|
||||
--- a/arch/x86/kernel/pvclock.c
|
||||
+++ b/arch/x86/kernel/pvclock.c
|
||||
@@ -120,6 +120,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
|
||||
|
||||
static atomic64_t last_value = ATOMIC64_INIT(0);
|
||||
|
||||
+void pvclock_resume(void)
|
||||
+{
|
||||
+ atomic64_set(&last_value, 0);
|
||||
+}
|
||||
+
|
||||
cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
|
||||
{
|
||||
struct pvclock_shadow_time shadow;
|
||||
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
|
||||
index b2bb5aa..5da5e53 100644
|
||||
--- a/arch/x86/xen/time.c
|
||||
+++ b/arch/x86/xen/time.c
|
||||
@@ -426,6 +426,8 @@ void xen_timer_resume(void)
|
||||
{
|
||||
int cpu;
|
||||
|
||||
+ pvclock_resume();
|
||||
+
|
||||
if (xen_clockevent != &xen_vcpuop_clockevent)
|
||||
return;
|
112
pkgs/servers/http/joseki/default.nix
Normal file
112
pkgs/servers/http/joseki/default.nix
Normal file
@ -0,0 +1,112 @@
|
||||
x@{builderDefsPackage
|
||||
, unzip
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
let
|
||||
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
|
||||
[];
|
||||
|
||||
buildInputs = map (n: builtins.getAttr n x)
|
||||
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
|
||||
sourceInfo = rec {
|
||||
baseName="jena-joseki";
|
||||
version="3.4.3-201103";
|
||||
name="${baseName}-${version}";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
inherit (sourceInfo) name version;
|
||||
inherit buildInputs;
|
||||
|
||||
tarballs = {
|
||||
jenaBin = a.fetchurl {
|
||||
url = "mirror://sourceforge/project/jena/Jena/Jena-2.6.4/jena-2.6.4.zip";
|
||||
sha256 = "ec23a24eee9148b1ddb366ab035a48eacd43c2b50c534a7bdd9cf31c6f8a9e7c";
|
||||
};
|
||||
josekiBin = a.fetchurl {
|
||||
url = "mirror://sourceforge/project/joseki/Joseki-SPARQL/Joseki-3.4.3/joseki-3.4.3.zip";
|
||||
sha256 = "cde1138e7bafcc2db7800dcde08f268237accd76c0a3e4b4c95cc96eacdcad12";
|
||||
};
|
||||
tdbBin = a.fetchurl {
|
||||
url = "mirror://sourceforge/project/jena/TDB/TDB-0.8.9/tdb-0.8.9.zip";
|
||||
sha256 = "78fd4b6cea5a6e412f1d58ba8a9e1fc72315becdf06f3675e4e604cd4435779e";
|
||||
};
|
||||
arqBin = a.fetchurl {
|
||||
url = "mirror://sourceforge/project/jena/ARQ/ARQ-2.8.7/arq-2.8.7.zip";
|
||||
sha256 = "66990e92514a85a9596a7efaf128041002cd098e063964dd5d2264cfcdd26070";
|
||||
};
|
||||
jettyBin = a.fetchurl {
|
||||
url = "http://dist.codehaus.org/jetty/jetty-6.1.26/jetty-6.1.26.zip";
|
||||
sha256 = "96c08eb87ec3772dccc2b3dba54fea85ccc3f804faf7429eecfba3ed55648187";
|
||||
};
|
||||
};
|
||||
tarballFiles = map (x: builtins.getAttr x tarballs) (builtins.attrNames tarballs);
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doDeploy" "fixScripts"];
|
||||
|
||||
fixScripts = a.doPatchShebangs ''$TARGET/bin'';
|
||||
|
||||
doDeploy = a.fullDepEntry (''
|
||||
${a.lib.concatStringsSep ";" (map (y : "unzip ${y}") tarballFiles)}
|
||||
for i in */; do cp -rTf $i merged; done
|
||||
cd merged
|
||||
|
||||
for i in "lib/"jsp-*/*.jar; do
|
||||
ln -s "''${i#lib/}" "lib" || true
|
||||
done
|
||||
|
||||
cp [Cc]opyright* doc
|
||||
mkdir lib/obsolete
|
||||
(
|
||||
ls "lib/"log4j-[0-9]*.jar | sort | tac | tail -n +2 ;
|
||||
ls "lib/"slf4j-api-[0-9]*.jar | sort | tac | tail -n +2 ;
|
||||
ls "lib/"xercesImpl-[0-9]*.jar | sort | tac | tail -n +2 ;
|
||||
ls "lib/"arq-[0-9]*.jar | sort | tac | tail -n +2
|
||||
ls "lib/"tdb-[0-9]*.jar | sort | tac | tail -n +2
|
||||
ls "lib/"jetty-[0-9]*.jar | sort | tac | tail -n +2
|
||||
ls "lib/"jetty-util-[0-9]*.jar | sort | tac | tail -n +2
|
||||
) |
|
||||
xargs -I @@ mv @@ lib/obsolete
|
||||
|
||||
mv lib/slf4j-simple-*.jar lib/obsolete
|
||||
|
||||
ensureDir "$out/share"
|
||||
TARGET="$out/share/${name}-dist"
|
||||
cp -r . "$TARGET"
|
||||
ln -s "$TARGET/lib" "$out/lib"
|
||||
chmod a+x "$TARGET/bin/"*
|
||||
ensureDir "$out/bin"
|
||||
|
||||
echo -e '#! /bin/sh\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands"
|
||||
echo '#! /bin/sh' >> "$out/bin/jena-command"
|
||||
echo 'export JENAROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
|
||||
echo 'export JOSEKIROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
|
||||
echo 'export TDBROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
|
||||
echo 'export ARQROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
|
||||
echo 'sh "'"$TARGET"'"/bin/"$@"' >> "$out/bin/jena-command"
|
||||
|
||||
chmod a+x "$out/bin/"*
|
||||
'') ["defEnsureDir" "minInit" "addInputs"];
|
||||
|
||||
trimVersions = a.fullDepEntry (''
|
||||
'') ["doDeploy" "minInit"];
|
||||
|
||||
passthru = {
|
||||
inherit tarballs;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "An RDF database with SparQL interface over HTTP";
|
||||
maintainers = with a.lib.maintainers;
|
||||
[
|
||||
raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
[]; # Builder is just unpacking/mixing what is needed
|
||||
license = "free"; # mix of packages under different licenses
|
||||
homepage = "http://openjena.org/";
|
||||
};
|
||||
}) x
|
||||
|
@ -1,8 +1,8 @@
|
||||
{ fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls
|
||||
, libxml2, zlib, guile, texinfo, cppunit, xz }:
|
||||
, libxml2, zlib, guile, texinfo, cppunit, xz, psmisc }:
|
||||
|
||||
let version = "0.10"; in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (rec {
|
||||
name = "myserver-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
@ -10,7 +10,8 @@ let version = "0.10"; in
|
||||
sha256 = "0w8njgka54if8ycd9cyxgmqa0ivv7r0rka7gda3x2rfr2z4nxvpb";
|
||||
};
|
||||
|
||||
patches = [ ./disable-dns-lookup-in-chroot.patch ];
|
||||
patches =
|
||||
[ ./disable-dns-lookup-in-chroot.patch ./installable-binary.patch ];
|
||||
|
||||
buildInputs =
|
||||
[ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ]
|
||||
@ -42,3 +43,11 @@ let version = "0.10"; in
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
};
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
# On GNU/Linux the `test_suite' process sometimes stays around, so
|
||||
# forcefully terminate it.
|
||||
(if stdenv.isLinux
|
||||
then { postCheck = "${psmisc}/bin/killall test_suite || true"; }
|
||||
else { }))
|
||||
|
14
pkgs/servers/http/myserver/installable-binary.patch
Normal file
14
pkgs/servers/http/myserver/installable-binary.patch
Normal file
@ -0,0 +1,14 @@
|
||||
We actually want the `myserver' binary to be installable. Failing to do that
|
||||
it gets an RPATH pointing to $top_builddir/src/.libs.
|
||||
|
||||
--- myserver-0.10/src/Makefile.in 2010-10-14 12:45:42.000000000 +0200
|
||||
+++ myserver-0.10/src/Makefile.in 2011-03-03 22:23:05.000000000 +0100
|
||||
@@ -1307,7 +1307,6 @@ libmyserver_la_LIBADD = \
|
||||
$(INTLLIBS) $(LDFLAGS)
|
||||
|
||||
myserver_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"
|
||||
-myserver_LDFLAGS = -static -no-install
|
||||
myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
|
||||
$(XNET_LIB) $(DL_LIB) $(ZLIB_LIB) \
|
||||
$(XML_LIBS) $(INTLLIBS) $(LDFLAGS)
|
||||
|
13
pkgs/tools/cd-dvd/mkcue/default.nix
Normal file
13
pkgs/tools/cd-dvd/mkcue/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mkcue-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diplodocus.org/dist/audio/${name}.tar.bz2";
|
||||
sha256 = "08md7si3frb8sjfqf3pm7qbrcvkbd10mzszlbydkxnyxdb530b04";
|
||||
};
|
||||
|
||||
preInstall = "mkdir -pv $out/bin";
|
||||
postInstall = "chmod -v +w $out/bin/mkcue";
|
||||
}
|
17
pkgs/tools/misc/vorbisgain/default.nix
Normal file
17
pkgs/tools/misc/vorbisgain/default.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ stdenv, fetchurl, unzip, libogg, libvorbis }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vorbisgain-0.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://sjeng.org/ftp/vorbis/${name}.zip";
|
||||
sha256 = "1sjxl20ahhjv63b8a99sq9p14vz3lf1gacivkk0x2c11cc9zw4nr";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip libogg libvorbis ];
|
||||
patchPhase = ''
|
||||
chmod -v +x configure
|
||||
sed -e 's/^ /\t/' -i Makefile.*
|
||||
configureFlags="--mandir=$out/share/man"
|
||||
'';
|
||||
}
|
@ -889,6 +889,8 @@ let
|
||||
|
||||
mjpegtools = callPackage ../tools/video/mjpegtools { };
|
||||
|
||||
mkcue = callPackage ../tools/cd-dvd/mkcue { };
|
||||
|
||||
mktemp = callPackage ../tools/security/mktemp { };
|
||||
|
||||
mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
|
||||
@ -1339,6 +1341,8 @@ let
|
||||
libXp;
|
||||
};
|
||||
|
||||
vorbisgain = callPackage ../tools/misc/vorbisgain { };
|
||||
|
||||
vpnc = callPackage ../tools/networking/vpnc { };
|
||||
|
||||
vtun = callPackage ../tools/networking/vtun { };
|
||||
@ -2796,6 +2800,8 @@ let
|
||||
|
||||
boost = callPackage ../development/libraries/boost { };
|
||||
|
||||
boost146 = callPackage ../development/libraries/boost/1.46.nix { };
|
||||
|
||||
# A Boost build with all library variants enabled. Very large (about 250 MB).
|
||||
boostFull = appendToName "full" (boost.override {
|
||||
enableDebug = true;
|
||||
@ -3490,6 +3496,8 @@ let
|
||||
libmpeg2 = mpeg2dec;
|
||||
};
|
||||
|
||||
libf2c = callPackage ../development/libraries/libf2c {};
|
||||
|
||||
libfixposix = callPackage ../development/libraries/libfixposix {};
|
||||
|
||||
libffcall = builderDefsPackage (import ../development/libraries/libffcall) {
|
||||
@ -4160,18 +4168,25 @@ let
|
||||
|
||||
vxl = callPackage ../development/libraries/vxl { };
|
||||
|
||||
webkit = ((builderDefsPackage ../development/libraries/webkit {
|
||||
inherit (gnome28) gtkdoc libsoup;
|
||||
inherit (gtkLibs) gtk atk pango glib;
|
||||
inherit freetype fontconfig gettext gperf curl
|
||||
webkit = let p = applyGlobalOverrides (x : {
|
||||
libsoup = x.gnome28.libsoup_2_31;
|
||||
gnome28 = x.gnome28 // {
|
||||
libsoup = x.gnome28.libsoup_2_31;
|
||||
};
|
||||
});
|
||||
in
|
||||
(p.builderDefsPackage ../development/libraries/webkit {
|
||||
inherit (p.gnome28) gtkdoc;
|
||||
inherit (p.gtkLibs) gtk atk pango glib;
|
||||
inherit (p) freetype fontconfig gettext gperf curl
|
||||
libjpeg libtiff libpng libxml2 libxslt sqlite
|
||||
icu cairo perl intltool automake libtool
|
||||
pkgconfig autoconf bison libproxy enchant
|
||||
python ruby which flex geoclue;
|
||||
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
|
||||
python ruby which flex geoclue libsoup;
|
||||
inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
|
||||
gstPluginsGood;
|
||||
inherit (xlibs) libXt renderproto libXrender;
|
||||
}).deepOverride {libsoup = gnome28.libsoup_2_31;});
|
||||
inherit (p.xlibs) libXt renderproto libXrender;
|
||||
});
|
||||
|
||||
wvstreams = callPackage ../development/libraries/wvstreams { };
|
||||
|
||||
@ -4479,6 +4494,8 @@ let
|
||||
|
||||
jetty61 = callPackage ../servers/http/jetty/6.1 { };
|
||||
|
||||
joseki = callPackage ../servers/http/joseki {};
|
||||
|
||||
lighttpd = callPackage ../servers/http/lighttpd { };
|
||||
|
||||
mod_python = callPackage ../servers/http/apache-modules/mod_python { };
|
||||
@ -4886,7 +4903,6 @@ let
|
||||
kernelPatches.cifs_timeout
|
||||
kernelPatches.no_xsave
|
||||
kernelPatches.dell_rfkill
|
||||
kernelPatches.xen_pvclock_resume
|
||||
];
|
||||
};
|
||||
|
||||
@ -6007,7 +6023,9 @@ let
|
||||
|
||||
flite = callPackage ../applications/misc/flite { };
|
||||
|
||||
freecad = callPackage ../applications/graphics/freecad { };
|
||||
freecad = callPackage ../applications/graphics/freecad {
|
||||
boost = boost146;
|
||||
};
|
||||
|
||||
freemind = callPackage ../applications/misc/freemind {
|
||||
jdk = jdk;
|
||||
|
Loading…
Reference in New Issue
Block a user