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

Merge remote-tracking branch 'origin/master' into stdenv-updates

Browse Source
This commit is contained in:
Eelco Dolstra 2013-01-22 23:23:53 +01:00
commit 0a47a28f1d
73 changed files with 2686 additions and 1817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/meta.xml
View File

@ -176,6 +176,12 @@ following:
(“MIT”) License</link>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>perl5</varname></term>
<listitem><para>The Perl 5 license (Artistic License, version 1
and GPL, version 1 or later).</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>free</varname></term>
<listitem><para>Catch-all for free software licenses not listed

6
maintainers/scripts/copy-tarball.sh
View File

@ -10,17 +10,17 @@ base="$(basename "$url")"
if [ -z "$base" ]; then echo "bad URL"; exit 1; fi
dstPath="$distDir/$base"
if [ -e "$dstPath" ]; then echo "$dstPath already exists"; exit 0; fi
if [ -e "$dstPath" ]; then if [ -n "$VERBOSE" ]; then echo "$dstPath already exists"; fi; exit 0; fi
if [ -z "$file" ]; then
echo "downloading $url to $dstPath"
if [ -n "$dryRun" ]; then exit 0; fi
if [ -n "$DRY_RUN" ]; then exit 0; fi
declare -a res
if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then
continue
exit
fi
storePath=${res[1]}

14
maintainers/scripts/copy-tarballs.sh
View File

@ -8,7 +8,19 @@ urls=$(nix-instantiate --eval-only --xml --strict '<nixpkgs/maintainers/scripts/
for url in $urls; do
if echo "$url" | grep -q -E "www.cs.uu.nl|nixos.org|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe|belastingdienst|microsoft|armijn/.nix|sun.com|archive.eclipse.org"; then continue; fi
if ! echo "$url" | grep -q -E "\-.*[0-9].*"; then echo "skipping $url"; continue; fi
# Check the URL scheme.
if ! echo "$url" | grep -q -E "^[a-z]+://"; then echo "skipping $url (no URL scheme)"; continue; fi
# Check the basename. It should include something resembling a version.
base="$(basename "$url")"
#if ! echo "$base" | grep -q -E "[-_].*[0-9].*"; then echo "skipping $url (no version)"; continue; fi
if ! echo "$base" | grep -q -E "[a-zA-Z]"; then echo "skipping $url (no letter in name)"; continue; fi
if ! echo "$base" | grep -q -E "[0-9]"; then echo "skipping $url (no digit in name)"; continue; fi
if ! echo "$base" | grep -q -E "[-_\.]"; then echo "skipping $url (no dot/underscore in name)"; continue; fi
if echo "$base" | grep -q -E "[&?=%]"; then echo "skipping $url (bad character in name)"; continue; fi
if [ "${base:0:1}" = "." ]; then echo "skipping $url (starts with a dot)"; continue; fi
$(dirname $0)/copy-tarball.sh "$url"
done

6
pkgs/applications/display-managers/slim/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
, fontconfig, freetype, pam, consolekit, dbus_libs }:
, fontconfig, freetype, pam, dbus_libs }:
stdenv.mkDerivation rec {
name = "slim-1.3.4";
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
buildInputs =
[ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
pam dbus_libs
] ++ stdenv.lib.optional (consolekit != null) consolekit;
];
preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1";
cmakeFlags = [ "-DUSE_PAM=1" ];
NIX_CFLAGS_LINK = "-lXmu";

8
pkgs/applications/graphics/feh/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib
, libXinerama, curl }:
stdenv.mkDerivation {
name = "feh-2.4";
stdenv.mkDerivation rec {
name = "feh-2.8";
src = fetchurl {
url = http://feh.finalrewind.org/feh-2.4.tar.bz2;
sha256 = "00liykp0ipmmiggl26wk72iawcff6zpmbniifdr3f5yf0sfanz48";
url = "http://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "0zmslchnzvi9ydxj2mgci4x8zpv5mdfkf7kyny3nibbpajibqmrx";
};
buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ];

5
pkgs/applications/graphics/qiv/default.nix
View File

@ -10,7 +10,10 @@ stdenv.mkDerivation (rec {
buildInputs = [ pkgconfig gtk imlib2 file ];
preBuild=''substituteInPlace Makefile --replace /usr/local "$out"'';
preBuild=''
substituteInPlace Makefile --replace /usr/local "$out"
substituteInPlace Makefile --replace /man/ /share/man/
'';
meta = {
description = "qiv (quick image viewer)";

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, qt4, libXtst, libvorbis, phonon, hunspell }:
{ stdenv, fetchurl, pkgconfig, qt4, libXtst, libvorbis, phonon, hunspell }:
stdenv.mkDerivation rec {
name = "goldendict-1.0.1";
src = fetchurl {
url = "mirror://sourceforge/goldendict/${name}-src.tar.bz2";
sha256 = "19p99dd5jgs0k66sy30vck7ymqj6dv1lh6w8xw18zczdll2h9yxk";
};
buildInputs = [ qt4 libXtst libvorbis phonon hunspell ];
buildInputs = [ pkgconfig qt4 libXtst libvorbis phonon hunspell ];
unpackPhase = ''
mkdir ${name}-src
cd ${name}-src

34
pkgs/applications/misc/nut/2.6.3.nix
View File

@ -1,34 +0,0 @@
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
stdenv.mkDerivation {
name = "nut-2.6.3";
src = fetchurl {
url = http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz;
sha256 = "0fk3bcivv26kw1psxb6sykqp9n5w02j01s1idypzlci0kmr3p49l";
};
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
nativeBuildInputs = [ pkgconfig ];
configureFlags = [
"--with-all"
"--with-ssl"
"--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ...
"--without-cgi"
"--without-hal"
];
meta = {
description = "Network UPS Tools";
longDescription = ''
Network UPS Tools is a collection of programs which provide a common
interface for monitoring and administering UPS, PDU and SCD hardware.
It uses a layered approach to connect all of the parts.
'';
homepage = http://www.networkupstools.org/;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pierron ];
priority = 10;
};
}

32
pkgs/applications/misc/nut/default.nix
View File

@ -1,21 +1,28 @@
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev }:
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
stdenv.mkDerivation {
name = "nut-2.6.1";
stdenv.mkDerivation rec {
name = "nut-2.6.5";
src = fetchurl {
url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz;
sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00";
url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz";
sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1";
};
buildInputs = [ pkgconfig neon libusb openssl udev ];
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
configureFlags = [
"--with-all"
"--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ...
"--without-cgi"
];
nativeBuildInputs = [ pkgconfig ];
configureFlags =
[ "--with-all"
"--with-ssl"
"--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ...
"--without-cgi"
"--without-hal"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
];
enableParallelBuilding = true;
meta = {
description = "Network UPS Tools";
@ -27,5 +34,6 @@ stdenv.mkDerivation {
homepage = http://www.networkupstools.org/;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pierron ];
priority = 10;
};
}

176
pkgs/applications/networking/browsers/firefox/17.0.nix
View File

@ -1,176 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false
}:
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "17.0.1";
xulVersion = "17.0.1"; # this attribute is used by other packages
src = fetchurl {
urls = [
# It is better to use this url for official releases, to take load off Mozilla's ftp server.
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "15c09796a388f0a78996427b7bc2c80f4e0496f3";
};
commonConfigureFlags =
[ "--enable-optimize"
#"--enable-profiling"
"--disable-debug"
"--enable-strip"
"--with-system-jpeg"
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer"
"--disable-updater"
];
xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = false;
preConfigure =
''
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
mkdir ../objdir
cd ../objdir
configureScript=../mozilla-release/configure
''; # */
#installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
rm xulrunner
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")";
fi;
done
for i in $out/lib/$libDir/*.so; do
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
done
for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
done
rm -f $out/bin/run-mozilla.sh
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-${firefoxVersion}";
inherit src;
enableParallelBuilding = true;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
"--disable-elf-hack"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
makeFlags = [
"SYSTEM_LIBXUL=1"
];
# Hack to work around make's idea of -lbz2 dependency
preConfigure =
''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
'';
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
cd "$out/lib/"firefox-*
rm firefox
echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
chmod a+x firefox
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
passthru = {
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};
}

6
pkgs/applications/networking/browsers/firefox/18.0.nix
View File

@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "18.0";
firefoxVersion = "18.0.1";
xulVersion = "18.0"; # this attribute is used by other packages
xulVersion = "18.0.1"; # this attribute is used by other packages
src = fetchurl {
@ -27,7 +27,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "3356562e69d699e5901df5a4da4e2e59dd1e7f57";
sha1 = "26415396233450a4e66bb0e0a73a258e1cb174ef";
};
commonConfigureFlags =

6
pkgs/applications/networking/dropbox/default.nix
View File

@ -65,7 +65,7 @@ in stdenv.mkDerivation {
installPhase = ''
ensureDir "$out/${appdir}"
cp -r .dropbox-dist/* "$out/${appdir}/"
cp -r ".dropbox-dist/"* "$out/${appdir}/"
ensureDir "$out/bin"
ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
@ -78,13 +78,13 @@ in stdenv.mkDerivation {
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
ensureDir "$out/share/applications"
cp ${desktopItem}/share/applications/* $out/share/applications
cp "${desktopItem}/share/applications/"* $out/share/applications
'';
buildInputs = [ patchelf ];
meta = {
homepage = "http://www.dropbox.com";
description = "Online stored folders (daemon version)";
homepage = http://www.dropbox.com;
};
}

7
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -1,19 +1,20 @@
{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
, pythonPackages, makeWrapper }:
, pythonPackages, cacert, cmake, makeWrapper }:
stdenv.mkDerivation rec {
version = "0.3.9.2";
version = "0.4.0";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/${name}.tar.gz";
sha256 = "114cffqwnrqx8r4dslz7sc4i4ky4akzh863rnzaw3dnn9ky9r503";
sha256 = "17jxknam1bbakmdfqy1b2cfc8l9ag90l3z1gcxdvwg358wasv9dc";
};
buildInputs =
[ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
cacert cmake
];
postInstall = ''

4
pkgs/desktops/kde-4.7/kde-workspace.nix
View File

@ -1,6 +1,6 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies
, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate
, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi
, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc
}:
@ -12,7 +12,7 @@ kde {
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate consolekit kdepimlibs pam prison akonadi
libusb python libqalculate kdepimlibs pam prison akonadi
];
nativeBuildInputs = [ pkgconfig ];

4
pkgs/desktops/kde-4.8/kde-workspace.nix
View File

@ -1,6 +1,6 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities
}:
@ -12,7 +12,7 @@ kde {
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate consolekit kdepimlibs pam prison akonadi
libusb python libqalculate kdepimlibs pam prison akonadi
kactivities
];

21
pkgs/development/compilers/llvm/clang-include-paths.patch
View File

@ -1,21 +0,0 @@
diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400
@@ -2146,9 +2146,6 @@
if (DriverArgs.hasArg(options::OPT_nostdinc))
return;
- if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
-
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
llvm::sys::Path P(D.ResourceDir);
P.appendComponent("include");
@@ -2264,6 +2261,7 @@
return;
// Check if libc++ has been enabled and provide its include paths if so.
+ // !!! Will need to modify this if/when nixpkgs uses libc++
if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) {
// libc++ is always installed at a fixed path on Linux currently.
addSystemInclude(DriverArgs, CC1Args,

57
pkgs/development/compilers/llvm/clang-ld-flags.patch
View File

@ -1,57 +0,0 @@
diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400
@@ -2077,16 +2077,6 @@
addPathIfExists(LibPath + "/../" + Multilib, Paths);
}
}
- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
-
- // Try walking via the GCC triple path in case of multiarch GCC
- // installations with strange symlinks.
- if (GCCInstallation.isValid())
- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
- "/../../" + Multilib, Paths);
// Add the non-multilib suffixed paths (if potentially different).
if (GCCInstallation.isValid()) {
@@ -2100,8 +2090,6 @@
addPathIfExists(LibPath, Paths);
}
}
- addPathIfExists(SysRoot + "/lib", Paths);
- addPathIfExists(SysRoot + "/usr/lib", Paths);
}
bool Linux::HasNativeLLVMSupport() const {
diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
--- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400
+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400
@@ -5210,24 +5210,6 @@
ToolChain.getArch() == llvm::Triple::thumb ||
(!Args.hasArg(options::OPT_static) &&
!Args.hasArg(options::OPT_shared))) {
- CmdArgs.push_back("-dynamic-linker");
- if (ToolChain.getArch() == llvm::Triple::x86)
- CmdArgs.push_back("/lib/ld-linux.so.2");
- else if (ToolChain.getArch() == llvm::Triple::arm ||
- ToolChain.getArch() == llvm::Triple::thumb)
- CmdArgs.push_back("/lib/ld-linux.so.3");
- else if (ToolChain.getArch() == llvm::Triple::mips ||
- ToolChain.getArch() == llvm::Triple::mipsel)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::mips64 ||
- ToolChain.getArch() == llvm::Triple::mips64el)
- CmdArgs.push_back("/lib64/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::ppc)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::ppc64)
- CmdArgs.push_back("/lib64/ld64.so.1");
- else
- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
}
CmdArgs.push_back("-o");

137
pkgs/development/compilers/llvm/clang-purity.patch Normal file
View File

@ -0,0 +1,137 @@
diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver/ToolChains.cpp
--- clang-3.2.src-orig/lib/Driver/ToolChains.cpp 2012-12-16 10:59:27.000000000 -0500
+++ clang-3.2.src/lib/Driver/ToolChains.cpp 2013-01-22 14:16:55.787547681 -0500
@@ -2153,16 +2153,6 @@
addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib", Paths);
}
}
- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
-
- // Try walking via the GCC triple path in case of multiarch GCC
- // installations with strange symlinks.
- if (GCCInstallation.isValid())
- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
- "/../../" + Multilib, Paths);
// Add the non-multilib suffixed paths (if potentially different).
if (GCCInstallation.isValid()) {
@@ -2176,8 +2166,6 @@
addPathIfExists(LibPath, Paths);
}
}
- addPathIfExists(SysRoot + "/lib", Paths);
- addPathIfExists(SysRoot + "/usr/lib", Paths);
}
bool Linux::HasNativeLLVMSupport() const {
@@ -2228,9 +2216,6 @@
if (DriverArgs.hasArg(options::OPT_nostdinc))
return;
- if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
-
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
llvm::sys::Path P(D.ResourceDir);
P.appendComponent("include");
@@ -2295,24 +2280,6 @@
"/usr/include/powerpc64-linux-gnu"
};
ArrayRef<StringRef> MultiarchIncludeDirs;
- if (getTriple().getArch() == llvm::Triple::x86_64) {
- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::x86) {
- MultiarchIncludeDirs = X86MultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::arm) {
- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
- else
- MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::mips) {
- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::mipsel) {
- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::ppc) {
- MultiarchIncludeDirs = PPCMultiarchIncludeDirs;
- } else if (getTriple().getArch() == llvm::Triple::ppc64) {
- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs;
- }
for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(),
E = MultiarchIncludeDirs.end();
I != E; ++I) {
@@ -2324,13 +2291,6 @@
if (getTriple().getOS() == llvm::Triple::RTEMS)
return;
-
- // Add an include of '/include' directly. This isn't provided by default by
- // system GCCs, but is often used with cross-compiling GCCs, and harmless to
- // add even when Clang is acting as-if it were a system compiler.
- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
-
- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include");
}
/// \brief Helper to add the thre variant paths for a libstdc++ installation.
diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tools.cpp
--- clang-3.2.src-orig/lib/Driver/Tools.cpp 2012-11-21 02:56:23.000000000 -0500
+++ clang-3.2.src/lib/Driver/Tools.cpp 2013-01-22 14:24:37.167212186 -0500
@@ -5972,34 +5972,6 @@
ToolChain.getArch() == llvm::Triple::thumb ||
(!Args.hasArg(options::OPT_static) &&
!Args.hasArg(options::OPT_shared))) {
- CmdArgs.push_back("-dynamic-linker");
- if (isAndroid)
- CmdArgs.push_back("/system/bin/linker");
- else if (ToolChain.getArch() == llvm::Triple::x86)
- CmdArgs.push_back("/lib/ld-linux.so.2");
- else if (ToolChain.getArch() == llvm::Triple::arm ||
- ToolChain.getArch() == llvm::Triple::thumb) {
- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
- CmdArgs.push_back("/lib/ld-linux-armhf.so.3");
- else
- CmdArgs.push_back("/lib/ld-linux.so.3");
- }
- else if (ToolChain.getArch() == llvm::Triple::mips ||
- ToolChain.getArch() == llvm::Triple::mipsel)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::mips64 ||
- ToolChain.getArch() == llvm::Triple::mips64el) {
- if (hasMipsN32ABIArg(Args))
- CmdArgs.push_back("/lib32/ld.so.1");
- else
- CmdArgs.push_back("/lib64/ld.so.1");
- }
- else if (ToolChain.getArch() == llvm::Triple::ppc)
- CmdArgs.push_back("/lib/ld.so.1");
- else if (ToolChain.getArch() == llvm::Triple::ppc64)
- CmdArgs.push_back("/lib64/ld64.so.1");
- else
- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
}
CmdArgs.push_back("-o");
diff -Naur clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp
--- clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp 2012-10-24 12:19:39.000000000 -0400
+++ clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp 2013-01-22 14:20:32.803925775 -0500
@@ -221,8 +221,6 @@
case llvm::Triple::Bitrig:
break;
default:
- // FIXME: temporary hack: hard-coded paths.
- AddPath("/usr/local/include", System, true, false, false);
break;
}
}
@@ -330,8 +328,6 @@
break;
}
- if ( os != llvm::Triple::RTEMS )
- AddPath("/usr/include", System, false, false, false);
}
void InitHeaderSearch::

12
pkgs/development/compilers/llvm/clang.nix
View File

@ -1,14 +1,13 @@
{ stdenv, fetchurl, perl, groff, llvm, cmake }:
{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }:
let version = "3.1"; in
let version = "3.2"; in
stdenv.mkDerivation {
name = "clang-${version}";
buildInputs = [ perl llvm groff cmake ];
buildInputs = [ perl llvm groff cmake libxml2 ];
patches = stdenv.lib.optionals (stdenv.gcc.libc != null)
[ ./clang-include-paths.patch ./clang-ld-flags.patch ];
patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch;
cmakeFlags = [
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
@ -22,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz";
sha256 = "0n2nzw3pw2v7fk67f2k2qyzd9wibvi3i5j7cjzz1csqgghzz1aia";
};
passthru = { gcc = stdenv.gcc.gcc; };
@ -35,4 +34,3 @@ stdenv.mkDerivation {
platforms = with stdenv.lib.platforms; all;
};
}

5
pkgs/development/compilers/llvm/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, groff, cmake, python }:
let version = "3.1"; in
let version = "3.2"; in
stdenv.mkDerivation {
name = "llvm-${version}";
src = fetchurl {
url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab";
sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j";
};
buildInputs = [ perl groff cmake python ];
@ -24,4 +24,3 @@ stdenv.mkDerivation {
platforms = with stdenv.lib.platforms; all;
};
}

22
pkgs/development/compilers/mit-scheme/default.nix
View File

@ -1,8 +1,12 @@
{ fetchurl, stdenv, gnum4, texinfo, texLive, automake }:
{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }:
let
version = "9.1.1";
bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
arch = if stdenv.isi686 then "-i386"
else if stdenv.isx86_64 then "-x86-64"
else "";
in
stdenv.mkDerivation {
name = "mit-scheme-${version}";
@ -25,6 +29,11 @@ stdenv.mkDerivation {
sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j";
};
configurePhase =
'' (cd src && ./configure)
(cd doc && ./configure)
'';
buildPhase =
'' cd src
${if bootstrapFromC
@ -42,11 +51,16 @@ stdenv.mkDerivation {
'';
installPhase =
'' make install -C src
make install -C doc
'' make prefix=$out install -C src
make prefix=$out install -C doc
'';
nativeBuildInputs = [ gnum4 texinfo texLive automake ];
fixupPhase =
'' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \
$out/lib/mit-scheme${arch}
'';
nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ];
# XXX: The `check' target doesn't exist.
doCheck = false;

16
pkgs/development/compilers/openjdk/cppflags-include-fix.patch
View File

@ -1,9 +1,9 @@
diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2011-06-27 13:19:26.000000000 -0400
+++ openjdk/jdk/make/sun/awt/mawt.gmk 2011-07-31 17:42:11.370026854 -0400
@@ -223,12 +223,6 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR) \
$(EVENT_MODEL)
--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2012-08-28 19:13:16.000000000 -0400
+++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500
@@ -234,12 +234,6 @@
endif # !HEADLESS
endif # PLATFORM
-ifeq ($(PLATFORM), linux)
- # Checking for the X11/extensions headers at the additional location
@ -11,6 +11,6 @@ diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.
- $(wildcard /usr/include/X11/extensions))
-endif
-
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
endif
ifeq ($(PLATFORM), macosx))
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-I$(OPENWIN_HOME)/include

41
pkgs/development/compilers/openjdk/default.nix
View File

@ -39,37 +39,18 @@ let
else
throw "openjdk requires i686-linux or x86_64 linux";
build = "147";
update = "6";
build = "24";
in
stdenv.mkDerivation rec {
name = "openj${if jreOnly then "re" else "dk"}-7b${build}";
name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}";
src = fetchurl {
url = "http://www.java.net/download/openjdk/jdk7/promoted/b${build}/openjdk-7-fcs-src-b${build}-27_jun_2011.zip";
sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs";
};
jaxws_src_name = "jdk7-jaxws2_2_4-b03-2011_05_27.zip";
jaxws_src = fetchurl {
url = "http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/${jaxws_src_name}";
sha256 = "1mpzgr9lnbf2p3x45npcniy47kbzi3hyqqbd4w3j63sxnxcp5bh5";
};
jaxp_src_name = "jaxp145_01.zip";
jaxp_src = fetchurl {
url = "http://download.java.net/jaxp/1.4.5/${jaxp_src_name}";
sha256 = "1js8m1a6lcn95byplmjjs1lja1maisyl6lgfjy1jx3lqi1hlr4n5";
};
jaf_src_name = "jdk7-jaf-2010_08_19.zip";
jaf_src = fetchurl {
url = "http://java.net/downloads/jax-ws/JDK7/${jaf_src_name}";
sha256 = "17n0i5cgvfsd6ric70h3n7hr8aqnzd216gaq3603wrxlvggzxbp6";
url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip";
sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9";
};
# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
@ -98,12 +79,6 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama";
postUnpack = ''
mkdir -p drops
cp ${jaxp_src} drops/${jaxp_src_name}
cp ${jaxws_src} drops/${jaxws_src_name}
cp ${jaf_src} drops/${jaf_src_name}
export DROPS_PATH=$(pwd)/drops
sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
-e "s@/bin/ls@${coreutils}/bin/ls@" \
openjdk/hotspot/make/linux/makefiles/sa.make
@ -117,8 +92,6 @@ stdenv.mkDerivation rec {
patches = [
./cppflags-include-fix.patch
./printf-fix.patch
./linux-version-check-fix.patch
./no-crypto-restrictions.patch
];
@ -135,7 +108,6 @@ stdenv.mkDerivation rec {
"DEVTOOLS_PATH="
"UNIXCOMMAND_PATH="
"BOOTDIR=${jdk}"
"DROPS_DIR=$(DROPS_PATH)"
];
configurePhase = ''
@ -172,4 +144,3 @@ stdenv.mkDerivation rec {
passthru = { inherit architecture; };
}

12
pkgs/development/compilers/openjdk/linux-version-check-fix.patch
View File

@ -1,12 +0,0 @@
diff -Naur openjdk-orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
--- openjdk-orig/hotspot/make/linux/Makefile 2011-06-27 12:10:07.000000000 -0400
+++ openjdk/hotspot/make/linux/Makefile 2011-08-10 20:08:40.879752771 -0400
@@ -230,7 +230,7 @@
# Solaris 2.5.1, 2.6).
# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3%
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))

12
pkgs/development/compilers/openjdk/printf-fix.patch
View File

@ -1,12 +0,0 @@
diff -Naur openjdk-orig/make/Defs-internal.gmk openjdk/make/Defs-internal.gmk
--- openjdk-orig/make/Defs-internal.gmk 2011-06-27 11:44:06.000000000 -0400
+++ openjdk/make/Defs-internal.gmk 2011-07-31 18:30:15.784506762 -0400
@@ -79,7 +79,7 @@
# Find all build_time_* files and print their contents in a list sorted
# on the name of the sub repository.
define ReportBuildTimes
-$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
+$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
$1 \
"`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
"`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \

13
pkgs/development/interpreters/python/python-linkme-wrapper.nix Normal file
View File

@ -0,0 +1,13 @@
{ stdenv }:
stdenv.mkDerivation {
name = "python-linkme-wrapper-1.0";
unpackPhase = "true";
installPhase = ''
mkdir -p $out/bin
cat ${./python-linkme-wrapper.sh} > $out/bin/.python-linkme-wrapper
chmod +x $out/bin/.python-linkme-wrapper
'';
}

34
pkgs/development/interpreters/python/python-linkme-wrapper.sh Normal file
View File

@ -0,0 +1,34 @@
#!/bin/sh
#
# Install it into a nix profile and from there build symlink chains.
# The chain will be followed to set the PYTHONPATH
# A/bin/foo -> B/bin/bar -> NIXENV/bin/.python-linkme-wrapper.sh
#
if test ! -L "$0"; then
echo "Link me!"
exit 1
fi
PROG=$(basename "$0")
SITES=
pypath() {
BIN=$(dirname "$1")
BIN=$(realpath -s "$BIN")
ENV=$(dirname "$BIN")
SITE="$ENV/lib/python2.7/site-packages"
SITES="$SITES${SITES:+:}$SITE"
PRG=$BIN/$(readlink "$1")
if test -L "$PRG"; then
pypath "$PRG"
fi
}
pypath $(realpath -s "$0")
export PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$SITES"
exec $BIN/$PROG "$@"

21
pkgs/development/interpreters/python/pythonhome-wrapper.nix
View File

@ -1,21 +0,0 @@
{ stdenv }:
stdenv.mkDerivation {
name = "pythonhome-wrapper";
unpackPhase = "true";
installPhase = ''
mkdir -p $out/bin
echo '
#!/bin/sh
BINDIR=`dirname $0`
PYTHONHOME=`dirname $BINDIR`
PYTHONHOME=`(cd $PYTHONHOME && pwd)`
export PYTHONHOME
$BINDIR/python "$@"
' > $out/bin/py
chmod +x $out/bin/py
'';
}

28
pkgs/development/libraries/consolekit/0001-Don-t-daemonize-when-activated.patch
View File

@ -1,28 +0,0 @@
Upstream patch
From fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 21 Dec 2009 11:13:23 -0500
Subject: [PATCH 1/2] Don't daemonize when activated
It confuses some versions of D-Bus and isn't needed
(or wanted it).
http://bugs.freedesktop.org/show_bug.cgi?id=25642
---
data/org.freedesktop.ConsoleKit.service.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/data/org.freedesktop.ConsoleKit.service.in b/data/org.freedesktop.ConsoleKit.service.in
index ec2128c..d716a36 100644
--- a/data/org.freedesktop.ConsoleKit.service.in
+++ b/data/org.freedesktop.ConsoleKit.service.in
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.freedesktop.ConsoleKit
-Exec=@sbindir@/console-kit-daemon
+Exec=@sbindir@/console-kit-daemon --no-daemon
User=root
--
1.7.1

62
pkgs/development/libraries/consolekit/0002-Don-t-take-bus-name-until-ready.patch
View File

@ -1,62 +0,0 @@
Upstream patch
From 2418840248f07025ad0edc96ed17e03ce5e47f3e Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 21 Dec 2009 11:14:54 -0500
Subject: [PATCH 2/2] Don't take bus name until ready
Previously, we would take a bus name right away, but
not register the manager object until later. This
causes a race when being activated by a method call
on the manager object, where ConsoleKit gets started
but the method call fails.
https://bugs.freedesktop.org/show_bug.cgi?id=25744
---
src/main.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main.c b/src/main.c
index 809c6d6..b8f698f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -294,11 +294,19 @@ main (int argc,
setup_debug_log (debug);
+ g_debug ("initializing console-kit-daemon %s", VERSION);
+
connection = get_system_bus ();
if (connection == NULL) {
goto out;
}
+ manager = ck_manager_new ();
+
+ if (manager == NULL) {
+ goto out;
+ }
+
bus_proxy = get_bus_proxy (connection);
if (bus_proxy == NULL) {
g_warning ("Could not construct bus_proxy object; bailing out");
@@ -310,16 +318,8 @@ main (int argc,
goto out;
}
- g_debug ("initializing console-kit-daemon %s", VERSION);
-
create_pid_file ();
- manager = ck_manager_new ();
-
- if (manager == NULL) {
- goto out;
- }
-
loop = g_main_loop_new (NULL, FALSE);
g_signal_connect (bus_proxy,
--
1.7.1

33
pkgs/development/libraries/consolekit/commands.patch
View File

@ -1,33 +0,0 @@
This patch adds shutdown commands specific to NixOS, as NixOS does not have
a /sbin or /usr/sbin directory. In order not to have a dependency on the
package that provides "shutdown" when in an environment other than NixOS,
we'll make it depend on /var/run/current-system.
Note: this patch does not compromise system security. Other systems than
NixOS should have already shutdown in the earlier directories being searched,
and otherwise /var/run is writable only be root.
--- ConsoleKit-0.4.1/tools/linux/ck-system-restart.org 2012-02-13 11:29:57.352902568 +0100
+++ ConsoleKit-0.4.1/tools/linux/ck-system-restart 2012-02-13 11:43:27.593317712 +0100
@@ -7,6 +7,9 @@
elif [ -x "/usr/sbin/shutdown" ] ; then
/usr/sbin/shutdown -r now
exit $?
+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
+ /var/run/current-system/sw/sbin/shutdown -r now
+ exit $?
else
exit 1
fi
--- ConsoleKit-0.4.1/tools/linux/ck-system-stop.org 2012-02-13 11:30:06.228950934 +0100
+++ ConsoleKit-0.4.1/tools/linux/ck-system-stop 2012-02-13 11:44:12.664563304 +0100
@@ -7,6 +7,9 @@
elif [ -x "/usr/sbin/shutdown" ] ; then
/usr/sbin/shutdown -h now
exit $?
+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
+ /var/run/current-system/sw/sbin/shutdown -h now
+ exit $?
else
exit 1
fi

29
pkgs/development/libraries/consolekit/default.nix
View File

@ -1,29 +0,0 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib,
libX11, polkit, expat }:
stdenv.mkDerivation rec {
name = "consolekit-0.4.1";
src = fetchurl {
url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.1.tar.bz2;
sha256 = "0gj0airrgyi14a06w3d4407g62bs5a1cam2h64s50x3d2k3ascph";
};
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ];
patches = [ ./0001-Don-t-daemonize-when-activated.patch
./0002-Don-t-take-bus-name-until-ready.patch
./commands.patch # adds shutdown commands for NixOS to the list of shutdown commands
];
# For console-kit to get the rpath to libgcc_s, needed for pthread_cancel to work
NIX_LDFLAGS = "-lgcc_s";
configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc";
installFlags = "sysconfdir=$(out)/etc DBUS_SYS_DIR=$(out)/etc/dbus-1/system.d"; # keep `make install' happy
meta = {
homepage = http://www.freedesktop.org/wiki/Software/ConsoleKit;
description = "A framework for defining and tracking users, login sessions, and seats";
};
}

2
pkgs/development/libraries/gnutls/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation (rec {
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD);
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
meta = {
description = "The GNU Transport Layer Security Library";

10
pkgs/development/libraries/haskell/JuicyPixels/default.nix
View File

@ -1,17 +1,17 @@
{ cabal, cereal, deepseq, mtl, primitive, transformers, vector
{ cabal, binary, deepseq, mtl, primitive, transformers, vector
, zlib
}:
cabal.mkDerivation (self: {
pname = "JuicyPixels";
version = "2.0.2";
sha256 = "14nqifdsdhzlfq29waqlwspyy37gp174vw368ph772zp9b0ngyff";
version = "3.0";
sha256 = "1qhhhnfs12r67nf07bx58n8a2v6wikan8cqs1wnjnaad8yk2spsg";
buildDepends = [
cereal deepseq mtl primitive transformers vector zlib
binary deepseq mtl primitive transformers vector zlib
];
meta = {
homepage = "https://github.com/Twinside/Juicy.Pixels";
description = "Picture loading/serialization (in png, jpeg, bitmap and gif)";
description = "Picture loading/serialization (in png, jpeg, bitmap, radiance and gif)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

14
pkgs/development/libraries/haskell/bifunctors/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, semigroupoids, semigroups }:
cabal.mkDerivation (self: {
pname = "bifunctors";
version = "3.0.3";
sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4";
buildDepends = [ semigroupoids semigroups ];
meta = {
homepage = "http://github.com/ekmett/bifunctors/";
description = "Haskell 98 bifunctors";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

16
pkgs/development/libraries/haskell/doctest/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ cabal, deepseq, filepath, ghcPaths, syb, transformers }:
cabal.mkDerivation (self: {
pname = "doctest";
version = "0.9.5";
sha256 = "073q56gyhkb7r4f94b9nx341dkmgapy8gig7f668jkghv2zci5ws";
isLibrary = true;
isExecutable = true;
buildDepends = [ deepseq filepath ghcPaths syb transformers ];
meta = {
homepage = "https://github.com/sol/doctest-haskell#readme";
description = "Test interactive Haskell examples";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

14
pkgs/development/libraries/haskell/groupoids/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, semigroupoids }:
cabal.mkDerivation (self: {
pname = "groupoids";
version = "3.0.1.1";
sha256 = "0r4xjyq7icd52nas27bhr5k8q7li6lba8mlkcipghhsgxsyjfp63";
buildDepends = [ semigroupoids ];
meta = {
homepage = "http://github.com/ekmett/groupoids/";
description = "Haskell 98 Groupoids";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/hakyll/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.1.1.0";
sha256 = "0v0c2hbwnd56q3vwrf9515v85yn2k850z9jd8y8kj2i79wh7l3dz";
version = "4.1.2.0";
sha256 = "1kbilad4ry8lyfcygajaphkgragmq5js349mjmh1bjn04rhjm54c";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/mongoDB/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "mongoDB";
version = "1.3.1";
sha256 = "1qvsb993n5gmchym4zz2pv68mdyir439cfindqdqlvjwam0jf4l5";
version = "1.3.2";
sha256 = "0gv0i2z6f797ibjfp16ax2aiqa66sclxjy8sabrwydwcyr96xb4y";
buildDepends = [
binary bson cryptohash liftedBase monadControl mtl network parsec
random randomShuffle text transformersBase

4
pkgs/development/libraries/haskell/pandoc/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "pandoc";
version = "1.10";
sha256 = "11zvyzn16zckgs1zzhl415y14nziw16zhgghg31a459d1ww7c3dg";
version = "1.10.0.4";
sha256 = "1zwjwzxgip3zhbs7v7i981f5ch1rrd8i04cmn1gkfxnapbxx6z26";
isLibrary = true;
isExecutable = true;
buildDepends = [

19
pkgs/development/libraries/haskell/profunctor-extras/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ cabal, comonad, profunctors, semigroupoidExtras, semigroupoids
, tagged, transformers
}:
cabal.mkDerivation (self: {
pname = "profunctor-extras";
version = "3.3";
sha256 = "0sdiwc1d2jx2xrzsxjsxjh8m24f4blr2m8vmh78knpi9hy0bxgvr";
buildDepends = [
comonad profunctors semigroupoidExtras semigroupoids tagged
transformers
];
meta = {
homepage = "http://github.com/ekmett/profunctor-extras/";
description = "Profunctor extras";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

14
pkgs/development/libraries/haskell/profunctors/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, comonad, tagged }:
cabal.mkDerivation (self: {
pname = "profunctors";
version = "3.2";
sha256 = "0c7242pk5hfz67cwjy0l7skqyz20akw9j2w7cb8iggcbbb27bgyc";
buildDepends = [ comonad tagged ];
meta = {
homepage = "http://github.com/ekmett/profunctors/";
description = "Haskell 98 Profunctors";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

14
pkgs/development/libraries/haskell/semigroupoid-extras/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, comonad, distributive, groupoids, semigroupoids }:
cabal.mkDerivation (self: {
pname = "semigroupoid-extras";
version = "3.0.1";
sha256 = "1b6ix9myjav1h4bbq3jxlan8sn2pjw8x0zhazv3anxfab5n2sxpd";
buildDepends = [ comonad distributive groupoids semigroupoids ];
meta = {
homepage = "http://github.com/ekmett/semigroupoid-extras";
description = "Semigroupoids requiring Haskell extensions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/skein/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "skein";
version = "0.1.0.10";
sha256 = "0qyiy2yx4qmazz744hyq51v2as51zd9r623bhhk21yzsgh7rl9kc";
version = "0.1.0.11";
sha256 = "16iy3frzxzkiybl5cglvnmvxzziwr8361s00m7130dh82r3vc21q";
buildDepends = [ cereal cryptoApi tagged ];
meta = {
homepage = "https://github.com/meteficha/skein";

2
pkgs/development/libraries/nettle/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation (rec {
buildInputs = [ gnum4 ];
propagatedBuildInputs = [ gmp ];
doCheck = (stdenv.system != "i686-cygwin");
doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin);
enableParallelBuilding = true;

2
pkgs/development/libraries/polkit/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
, gobjectIntrospection
, useSystemd ? false, systemd ? null }:
, useSystemd ? true, systemd }:
let

4
pkgs/development/mobile/titaniumenv/build-app.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation {
# Ensure that the requested provisioning profile can be found
if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles" ]
if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
then
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
@ -75,7 +75,7 @@ stdenv.mkDerivation {
# Ensure that the requested provisioning profile can be found
if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles" ]
if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
then
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"

15
pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix
View File

@ -1,15 +0,0 @@
{ fetchurl, buildPerlPackage, bzip2 }:
buildPerlPackage rec {
name = "Compress-Raw-Bzip2-2.055";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
sha256 = "1qssagii3xy87lsnlq5y7cngasiiq7jmbi1s6lcwwfhv36ydlmx8";
};
# Don't build a private copy of bzip2.
BUILD_BZIP2 = false;
BZIP2_LIB = "${bzip2}/lib";
BZIP2_INCLUDE = "${bzip2}/include";
}

8
pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, buildPerlPackage, zlib, stdenv }:
buildPerlPackage rec {
name = "Compress-Raw-Zlib-2.056";
name = "Compress-Raw-Zlib-2.060";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
sha256 = "08cbgbrfx718r1n9d8hzmv7ssnhw41b0pwg7fw6dcq3svqhmwkyl";
sha256 = "03z2vqcdpysanqnh9m714fs2mcfshzbkd8i11w359h69h5q0kms3";
};
preConfigure = ''
@ -19,4 +19,8 @@ buildPerlPackage rec {
'';
doCheck = !stdenv.isDarwin;
meta = {
license = "perl5";
};
}

11
pkgs/development/perl-modules/DBD-Pg/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, buildPerlPackage, DBI, postgresql }:
buildPerlPackage rec {
name = "DBD-Pg-2.19.2";
name = "DBD-Pg-2.19.3";
src = fetchurl {
url = "mirror://cpan/modules/by-module/DBD/${name}.tar.gz";
sha256 = "0scnhbp0lfclbppbsfzmcyw32z8jhb9calvbg9q3gk4kli1119j9";
sha256 = "0ai6p2094hrh6kjlwfjvpw2z8wqa3scr4ba3p6rqza3z9c9hsd9p";
};
buildInputs = [ postgresql ];
@ -13,5 +13,10 @@ buildPerlPackage rec {
makeMakerFlags = "POSTGRES_HOME=${postgresql}";
meta.platforms = stdenv.lib.platforms.linux;
meta = {
homepage = http://search.cpan.org/dist/DBD-Pg/;
description = "DBI PostgreSQL interface";
license = "perl";
platforms = stdenv.lib.platforms.linux;
};
}

23
pkgs/development/perl-modules/starman-dont-change-name.patch
View File

@ -1,23 +0,0 @@
Changing the process name breaks applying libcgroup rules, so don't do it.
diff -ru -x '*~' Starman-0.2014-orig/lib/Starman/Server.pm Starman-0.2014/lib/Starman/Server.pm
--- Starman-0.2014-orig/lib/Starman/Server.pm 2011-08-27 01:19:43.000000000 +0200
+++ Starman-0.2014/lib/Starman/Server.pm 2011-11-25 13:30:24.570434653 +0100
@@ -100,7 +100,7 @@
sub run_parent {
my $self = shift;
- $0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
+ #$0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
$self->SUPER::run_parent(@_);
}
@@ -113,7 +113,7 @@
DEBUG && warn "[$$] Initializing the PSGI app\n";
$self->{app} = $self->{options}->{psgi_app_builder}->();
}
- $0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
+ #$0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
}
sub post_accept_hook {

23
pkgs/development/perl-modules/template-toolkit-nix-store.patch
View File

@ -1,23 +0,0 @@
diff -rc Template-Toolkit-2.20-orig/lib/Template/Provider.pm Template-Toolkit-2.20/lib/Template/Provider.pm
*** Template-Toolkit-2.20-orig/lib/Template/Provider.pm 2008-08-06 11:32:02.000000000 +0200
--- Template-Toolkit-2.20/lib/Template/Provider.pm 2008-11-28 16:37:36.000000000 +0100
***************
*** 936,942 ****
sub _template_modified {
my $self = shift;
my $template = shift || return;
! return (stat( $template ))[9];
}
#------------------------------------------------------------------------
--- 936,945 ----
sub _template_modified {
my $self = shift;
my $template = shift || return;
! # Nix specific hack: timestamps of 0 (1-1-1970) should not be
! # treated as undefined, so return 1 instead.
! my $t = (stat( $template ))[9];
! return (defined $t && $t == 0) ? 1 : $t;
}
#------------------------------------------------------------------------

8
pkgs/development/python-modules/generic/default.nix
View File

@ -50,11 +50,13 @@ python.stdenv.mkDerivation (attrs // {
name = namePrefix + name;
# default values for maintainers and platforms
# default to python's platforms and add maintainer(s) to every
# package
meta = {
maintainers = python.meta.maintainers;
platforms = python.meta.platforms;
} // meta;
} // meta // {
maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ];
};
# checkPhase after installPhase to run tests on installed packages
phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase";

2
pkgs/development/python-modules/offline-distutils/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
unpackPhase = "true";
installPhase = ''
dst="$out/lib/${python.libPrefix}"
dst="$out/lib/${python.libPrefix}/site-packages"
ensureDir $dst/distutils
ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/
cat <<EOF > $dst/distutils/distutils.cfg

4
pkgs/os-specific/linux/mcelog/default.nix
View File

@ -25,6 +25,10 @@ in stdenv.mkDerivation {
makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc";
preInstall = ''
ensureDir $out/share/doc
'';
meta = {
description = "Tool to display logged machine check exceptions";
homepage = http://mcelog.org/;

58
pkgs/os-specific/linux/udev/173.nix
View File

@ -1,58 +0,0 @@
{ stdenv, fetchurl, gperf, pkgconfig, glib, acl
, libusb, usbutils, pciutils }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "udev-173";
src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
sha256 = "1bxadi4bi11v8ipzj22wknv8hsb0wgdb99bx3w9w33rgl4aq78bh";
};
buildInputs = [ gperf pkgconfig glib acl libusb usbutils ];
configureFlags =
''
--with-pci-ids-path=${pciutils}/share/pci.ids
--enable-udev_acl --enable-edd
--disable-introspection --libexecdir=$(out)/lib/udev
--with-firmware-path=/root/test-firmware:/var/run/current-system/firmware
'';
# Workaround for the Linux kernel headers being too old.
NIX_CFLAGS_COMPILE = "-DBTN_TRIGGER_HAPPY=0x2c0";
postInstall =
''
# The path to rule_generator.functions in write_cd_rules and
# write_net_rules is broken. Also, don't store the mutable
# persistant rules in /etc/udev/rules.d but in
# /var/lib/udev/rules.d.
for i in $out/lib/udev/write_cd_rules $out/lib/udev/write_net_rules; do
substituteInPlace $i \
--replace /lib/udev $out/lib/udev \
--replace /etc/udev/rules.d /var/lib/udev/rules.d
done
# Don't set PATH to /bin:/sbin; won't work in NixOS.
sed -e '/PATH=/d' -i $out/lib/udev/rule_generator.functions
ln -sv $out/lib/ConsoleKit $out/etc/ConsoleKit
rm -frv $out/share/gtk-doc
'';
patches = [ ./custom-rules.patch ] ++
[(fetchurl {
url = https://bugs.archlinux.org/task/25356?getfile=7281;
sha256 = "01xib1pfdbwacgx8dqxgrf67a0mwkpm4kxy9f9v3df93v0m4pmbm";
})] ++
stdenv.lib.optional stdenv.isArm ./pre-accept4-kernel.patch;
meta = {
homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
description = "Udev manages the /dev filesystem";
};
}

91
pkgs/os-specific/linux/udev/custom-rules.patch
View File

@ -1,91 +0,0 @@
commit c49ec33ba0f1a7f11b188913bb4895360ced67f8
Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
Date: Tue Aug 16 16:28:56 2011 +0400
Upstream considers presence of rules_dir=... in udev.conf as a very special case.
In particular, they disable /dev/.udev/*. Re-enable it.
diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 6bf2726..c1ae1f3 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1812,6 +1812,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
struct udev_list file_list;
struct udev_list_entry *file_loop;
struct token end_token;
+ char runpathrules[UTIL_PATH_SIZE];
rules = calloc(1, sizeof(struct udev_rules));
if (rules == NULL)
@@ -1854,22 +1855,21 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
rules->trie_nodes_cur = 1;
if (udev_get_rules_path(udev) == NULL) {
- char filename[UTIL_PATH_SIZE];
/* /lib/udev -- default/package rules */
add_matching_files(udev, &file_list, LIBEXECDIR "/rules.d", ".rules");
/* /etc/udev -- system-specific/user/admin rules */
add_matching_files(udev, &file_list, SYSCONFDIR "/udev/rules.d", ".rules");
-
- /* /run/udev -- throw-away/temporary rules */
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
- add_matching_files(udev, &file_list, filename, ".rules");
} else {
/* custom rules files location for testing */
add_matching_files(udev, &file_list, udev_get_rules_path(udev), ".rules");
}
+ /* /run/udev -- throw-away/temporary rules */
+ util_strscpyl(runpathrules, sizeof(runpathrules), udev_get_run_path(udev), "/rules.d", NULL);
+ add_matching_files(udev, &file_list, runpathrules, ".rules");
+
/* add all filenames to the string buffer */
udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) {
const char *filename = udev_list_entry_get_value(file_loop);
diff --git a/udev/udevd.c b/udev/udevd.c
index f1a31e7..45d10b6 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -1198,6 +1198,8 @@ int main(int argc, char *argv[])
struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker;
struct udev_ctrl_connection *ctrl_conn = NULL;
int rc = 1;
+ char filename[UTIL_PATH_SIZE];
+ struct stat statbuf;
udev = udev_new();
if (udev == NULL)
@@ -1480,23 +1482,21 @@ int main(int argc, char *argv[])
inotify_add_watch(fd_inotify, udev_get_rules_path(udev),
IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
} else {
- char filename[UTIL_PATH_SIZE];
- struct stat statbuf;
inotify_add_watch(fd_inotify, LIBEXECDIR "/rules.d",
IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
inotify_add_watch(fd_inotify, SYSCONFDIR "/udev/rules.d",
IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ }
- /* watch dynamic rules directory */
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
- if (stat(filename, &statbuf) != 0) {
- util_create_path(udev, filename);
- mkdir(filename, 0755);
- }
- inotify_add_watch(fd_inotify, filename,
- IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ /* watch dynamic rules directory */
+ util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
+ if (stat(filename, &statbuf) != 0) {
+ util_create_path(udev, filename);
+ mkdir(filename, 0755);
}
+ inotify_add_watch(fd_inotify, filename,
+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
udev_watch_restore(udev);
/* block and listen to all signals on signalfd */

43
pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
View File

@ -1,43 +0,0 @@
From:
https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch
diff -urN a/udev/udev-ctrl.c b/udev/udev-ctrl.c
--- a/udev/udev-ctrl.c 2011-10-09 17:10:32.000000000 -0600
+++ b/udev/udev-ctrl.c 2011-10-25 15:11:09.000000000 -0600
@@ -15,6 +15,7 @@
#include <stddef.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
#include <sys/types.h>
#include <sys/poll.h>
#include <sys/socket.h>
@@ -182,6 +183,7 @@
struct ucred ucred;
socklen_t slen;
const int on = 1;
+ int flgs;
conn = calloc(1, sizeof(struct udev_ctrl_connection));
if (conn == NULL)
@@ -189,13 +191,19 @@
conn->refcount = 1;
conn->uctrl = uctrl;
- conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
+// conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
+ conn->sock = accept(uctrl->sock, NULL, NULL);
if (conn->sock < 0) {
if (errno != EINTR)
err(uctrl->udev, "unable to receive ctrl connection: %m\n");
goto err;
}
+// Since we don't have accept4
+ flgs = fcntl(conn->sock, F_GETFL, NULL);
+ if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
+ fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
+
/* check peer credential of connection */
slen = sizeof(ucred);
if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {

7
pkgs/os-specific/linux/udisks/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5";
};
patches = [ ./purity.patch ];
patches = [ ./purity.patch ./no-pci-db.patch ];
postPatch =
''
@ -30,11 +30,6 @@ stdenv.mkDerivation rec {
configureFlags = "--localstatedir=/var --enable-lvm2";
preConfigure =
''
# Ensure that udisks can find the necessary programs.
'';
meta = {
homepage = http://www.freedesktop.org/wiki/Software/udisks;
description = "A daemon and command-line utility for querying and manipulating storage devices";

13
pkgs/os-specific/linux/udisks/no-pci-db.patch Normal file
View File

@ -0,0 +1,13 @@
Systemd no longer has the pci-db program.
diff -ru -x '*~' udisks-1.0.4-orig/data/80-udisks.rules udisks-1.0.4/data/80-udisks.rules
--- udisks-1.0.4-orig/data/80-udisks.rules 2011-08-25 23:31:20.000000000 +0200
+++ udisks-1.0.4/data/80-udisks.rules 2012-12-13 13:06:52.189650854 +0100
@@ -3,7 +3,6 @@
# import names for PCI storage controllers
#
-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
# Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
# the device is on a cardbus controller (upper PCI device) - then we check

2
pkgs/os-specific/linux/upower/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
, useSystemd ? false, systemd ? null
, useSystemd ? true, systemd
}:
assert stdenv.isLinux;

12
pkgs/servers/nosql/redis/darwin.patch
View File

@ -1,12 +0,0 @@
diff -ru redis-2.4.7/deps/hiredis/Makefile redis-2.4.7.patched/deps/hiredis/Makefile
--- redis-2.4.7/deps/hiredis/Makefile 2012-02-02 14:29:24.000000000 +0000
+++ redis-2.4.7.patched/deps/hiredis/Makefile 2012-12-07 17:14:43.000000000 +0000
@@ -20,7 +20,7 @@
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
CCLINK?=-lm -pthread
LDFLAGS?=-L. -Wl,-rpath,.
- OBJARCH?=-arch i386 -arch x86_64
+ #OBJARCH?=-arch i386 -arch x86_64
DYLIBNAME?=libhiredis.dylib
DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
STLIBNAME?=libhiredis.a

12
pkgs/servers/nosql/redis/default.nix
View File

@ -1,19 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "redis";
version = "2.4.7";
name = "${pname}-${version}";
name = "redis-2.6.9";
src = fetchurl {
url = "http://redis.googlecode.com/files/redis-2.4.7.tar.gz";
sha256 = "f91956377b7ff23cc23e0c8758e0b873032f36545c61d88436ebb741bf4dd5e1";
url = "http://redis.googlecode.com/files/${name}.tar.gz";
sha256 = "12bl3inq7xr2lqlqbxjxa3v9s5v7xn2pxlbm72ivxbiq43zpx5jd";
};
makeFlags = "PREFIX=$(out)";
# commented out until the patch is found
# patches = if stdenv.isDarwin then [ ./darwin.patch ] else [];
enableParallelBuilding = true;
meta = {
homepage = http://redis.io;
description = "An open source, advanced key-value store";

18
pkgs/tools/misc/system-config-printer/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto
, makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl
, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups
, pythonDBus, libxml2, desktop_file_utils, libusb1, cups, pycups
, pythonPackages
, withGUI ? true
}:
stdenv.mkDerivation rec {
name = "${meta.name}-${meta.version}";
name = "system-config-printer-1.3.12";
src = fetchurl {
url = "http://cyberelk.net/tim/data/${meta.name}/1.3/${name}.tar.xz";
sha256 = "1d50rqgpyrzyrxwq3qhafzq9075qm2wxdrh1f1q7whlr0chxi3mw";
url = "http://cyberelk.net/tim/data/system-config-printer/1.3/${name}.tar.xz";
sha256 = "1cg9n75rg5l9vr1925n2g771kga33imikyl0mf70lww2sfgvs18r";
};
buildInputs =
[ intltool pkgconfig glib udev libusb cups xmlto
[ intltool pkgconfig glib udev libusb1 cups xmlto
libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
pythonPackages.python pythonPackages.wrapPython
];
@ -23,7 +23,10 @@ stdenv.mkDerivation rec {
[ pythonDBus pycups pygobject ]
++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ];
configureFlags = "--with-udev-rules";
configureFlags =
[ "--with-udev-rules"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
];
postInstall =
''
@ -34,7 +37,6 @@ stdenv.mkDerivation rec {
'';
meta = {
name = "system-config-printer";
version = "1.3.4";
homepage = http://cyberelk.net/tim/software/system-config-printer/;
};
}

8
pkgs/tools/networking/network-manager/default.nix
View File

@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
"--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
"--with-crypto=gnutls" "--disable-more-warnings"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-kernel-firmware-dir=/run/current-system/firmware" ];
"--with-kernel-firmware-dir=/run/current-system/firmware"
"--with-session-tracking=systemd" ];
buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ];
@ -55,11 +56,14 @@ stdenv.mkDerivation rec {
postInstall =
''
mkdir -p $out/lib/NetworkManager
# FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
'';
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/NetworkManager/;
description = "Network configuration and management in an easy way. Desktop environment independent.";
description = "Network configuration and management tool";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ phreedom urkud rickynils ];
platforms = platforms.linux;

30
pkgs/tools/networking/tinc/default.nix Normal file
View File

@ -0,0 +1,30 @@
{stdenv, fetchurl, lzo, openssl, zlib}:
stdenv.mkDerivation rec {
version = "1.0.19";
name = "tinc-${version}";
src = fetchurl {
url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
sha256 = "183nxj23d05vc3pxwbb692lr048wr81wnv0avzlkdm4r6c3bp7jh";
};
buildInputs = [ lzo openssl zlib ];
configureFlags = ''
--localstatedir=/var
--sysconfdir=/etc
'';
meta = {
description = "VPN daemon with full mesh routing";
longDescription = ''
tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
encryption to create a secure private network between hosts on the
Internet. It features full mesh routing, as well as encryption,
authentication, compression and ethernet bridging.
'';
homepage="http://www.tinc-vpn.org/";
license = stdenv.lib.licenses.gpl2Plus;
};
}

12
pkgs/tools/package-management/nix/unstable.nix
View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.2pre2980_9de6bc5";
name = "nix-1.4pre3044_536c85e";
src = fetchurl {
url = "http://hydra.nixos.org/build/3338447/download/4/${name}.tar.bz2";
sha256 = "b767c2b75a0036edfc6be209dcaab23643887b192e3788640380ac27298b08d0";
url = "http://hydra.nixos.org/build/3794557/download/5/${name}.tar.xz";
sha256 = "d0f952ff3b4c0cf7f9682b45844ffb3686ff333d02be83341380186a97834f95";
};
nativeBuildInputs = [ perl pkgconfig ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
configureFlags =
''
--with-store-dir=${storeDir} --localstatedir=${stateDir}
--with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
--with-dbi=${perlPackages.DBI}/${perl.libPrefix}
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
@ -35,6 +35,10 @@ stdenv.mkDerivation rec {
CFLAGS=-O3 CXXFLAGS=-O3
'';
makeFlags = "profiledir=$(out)/etc/profile.d";
installFlags = "sysconfdir=$(out)/etc";
doInstallCheck = true;
crossAttrs = {

4
pkgs/tools/security/gnupg1/default.nix
View File

@ -15,11 +15,11 @@ let
in
stdenv.mkDerivation rec {
name = "gnupg-1.4.12";
name = "gnupg-1.4.13";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha1 = "9b78e20328d35525af7b8a9c1cf081396910e937";
sha1 = "17a75c54d292bd0923f0a1817a1b02ded37d1de1";
};
buildInputs = [ readline bzip2 ];

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

@ -237,7 +237,7 @@ let
### BUILD SUPPORT
attrSetToDir = arg : import ../build-support/upstream-updater/attrset-to-dir.nix {
attrSetToDir = arg: import ../build-support/upstream-updater/attrset-to-dir.nix {
inherit writeTextFile stdenv lib;
theAttrSet = arg;
};
@ -1591,6 +1591,8 @@ let
guile = guile_1_8;
};
tinc = callPackage ../tools/networking/tinc { };
tmux = callPackage ../tools/misc/tmux { };
tor = callPackage ../tools/security/tor { };
@ -1881,7 +1883,11 @@ let
ccl = builderDefsPackage ../development/compilers/ccl {};
clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { };
clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix {
stdenv = if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gccApple
else stdenv;
};
clang = wrapClang clangUnwrapped;
@ -2490,7 +2496,11 @@ let
fpc = fpc;
};
llvm = callPackage ../development/compilers/llvm { };
llvm = callPackage ../development/compilers/llvm {
stdenv = if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gccApple
else stdenv;
};
mitscheme = callPackage ../development/compilers/mit-scheme { };
@ -2860,7 +2870,7 @@ let
inherit (python27Packages) recursivePthLoader;
};
pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { };
pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { };
pyrex = pyrex095;
@ -3488,8 +3498,6 @@ let
confuse = callPackage ../development/libraries/confuse { };
consolekit = callPackage ../development/libraries/consolekit { };
coredumper = callPackage ../development/libraries/coredumper { };
ctl = callPackage ../development/libraries/ctl { };
@ -5143,7 +5151,6 @@ let
### DEVELOPMENT / LIBRARIES / JAVA
atermjava = callPackage ../development/libraries/java/aterm {
stdenv = overrideInStdenv stdenv [gnumake380];
};
@ -5214,6 +5221,7 @@ let
jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
### DEVELOPMENT / PERL MODULES
buildPerlPackage = import ../development/perl-modules/generic perl;
@ -5313,7 +5321,7 @@ let
twisted = pythonPackages.twisted;
ZopeInterface = pythonPackages.zopeInterface;
ZopeInterface = pythonPackages.zope_interface;
### SERVERS
@ -5806,7 +5814,7 @@ let
kernelPatches =
[ kernelPatches.fbcondecor_2_6_31
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs2_2_6_32
# kernelPatches.aufs2_2_6_32
kernelPatches.cifs_timeout_2_6_29
kernelPatches.no_xsave
kernelPatches.dell_rfkill
@ -5818,7 +5826,7 @@ let
kernelPatches =
[ kernelPatches.fbcondecor_2_6_31
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs2_2_6_32
# kernelPatches.aufs2_2_6_32
kernelPatches.cifs_timeout_2_6_29
kernelPatches.no_xsave
kernelPatches.dell_rfkill
@ -5830,7 +5838,7 @@ let
kernelPatches =
[ kernelPatches.fbcondecor_2_6_35
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs2_2_6_35
# kernelPatches.aufs2_2_6_35
kernelPatches.cifs_timeout_2_6_35
] ++ lib.optional (platform.kernelArch == "arm")
kernelPatches.sheevaplug_modules_2_6_35;
@ -5852,7 +5860,7 @@ let
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_0
# kernelPatches.aufs3_0
];
};
@ -5861,7 +5869,7 @@ let
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_1
# kernelPatches.aufs3_1
];
};
@ -5870,7 +5878,7 @@ let
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_2
# kernelPatches.aufs3_2
kernelPatches.cifs_timeout_2_6_38
];
};
@ -5886,7 +5894,7 @@ let
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_3
# kernelPatches.aufs3_3
];
};
@ -5895,7 +5903,7 @@ let
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_4
# kernelPatches.aufs3_4
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
@ -5907,7 +5915,7 @@ let
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_5
# kernelPatches.aufs3_5
kernelPatches.perf3_5
kernelPatches.cifs_timeout_3_5_7
] ++ lib.optionals (platform.kernelArch == "mips")
@ -5922,7 +5930,7 @@ let
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_6
# kernelPatches.aufs3_6
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
@ -5935,7 +5943,7 @@ let
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_7
# kernelPatches.aufs3_7
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
@ -6300,8 +6308,7 @@ let
});
udev145 = callPackage ../os-specific/linux/udev/145.nix { };
udev173 = callPackage ../os-specific/linux/udev/173.nix { };
udev = pkgs.udev173;
udev = pkgs.systemd;
udisks = callPackage ../os-specific/linux/udisks { };
@ -7026,7 +7033,7 @@ let
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
firefoxPkgs = pkgs.firefox17Pkgs;
firefoxPkgs = pkgs.firefox18Pkgs;
firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
inherit (gnome) libIDL;
@ -7040,13 +7047,6 @@ let
firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
firefox17Pkgs = callPackage ../applications/networking/browsers/firefox/17.0.nix {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
};
firefox17Wrapper = lowPrio (wrapFirefox { browser = firefox17Pkgs.firefox; });
firefox18Pkgs = callPackage ../applications/networking/browsers/firefox/18.0.nix {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
@ -8937,19 +8937,13 @@ let
stateDir = config.nix.stateDir or "/nix/var";
};
nixUnstable = nixStable;
/*
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
};
*/
nut = callPackage ../applications/misc/nut { };
nut_2_6_3 = callPackage ../applications/misc/nut/2.6.3.nix { };
disnix = callPackage ../tools/package-management/disnix { };
disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts {

12
pkgs/top-level/haskell-packages.nix
View File

@ -491,6 +491,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
benchpress = callPackage ../development/libraries/haskell/benchpress {};
bifunctors = callPackage ../development/libraries/haskell/bifunctors {};
bimap = callPackage ../development/libraries/haskell/bimap {};
binary_hackage = callPackage ../development/libraries/haskell/binary {};
@ -733,6 +735,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
dns = callPackage ../development/libraries/haskell/dns {};
doctest = callPackage ../development/libraries/haskell/doctest {};
dotgen = callPackage ../development/libraries/haskell/dotgen {};
doubleConversion = callPackage ../development/libraries/haskell/double-conversion {};
@ -908,6 +912,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
polyparse = self.polyparse_1_7;
};
groupoids = callPackage ../development/libraries/haskell/groupoids {};
hakyll = callPackage ../development/libraries/haskell/hakyll {};
hamlet = callPackage ../development/libraries/haskell/hamlet {};
@ -1387,6 +1393,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {};
primitive = self.primitive_0_5_0_1;
profunctors = callPackage ../development/libraries/haskell/profunctors {};
profunctorExtras = callPackage ../development/libraries/haskell/profunctor-extras {};
projectTemplate = callPackage ../development/libraries/haskell/project-template {};
processExtras = callPackage ../development/libraries/haskell/process-extras {};
@ -1504,6 +1514,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {};
semigroupoidExtras = callPackage ../development/libraries/haskell/semigroupoid-extras {};
setenv = callPackage ../development/libraries/haskell/setenv {};
shelly = callPackage ../development/libraries/haskell/shelly {};

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

File diff suppressed because it is too large Load Diff

524
pkgs/top-level/python-packages.nix
View File

@ -1,6 +1,12 @@
{ pkgs, python }:
let pythonPackages = python.modules // rec {
let
isPy26 = python.majorVersion == "2.6";
isPy27 = python.majorVersion == "2.7";
optional = pkgs.lib.optional;
optionals = pkgs.lib.optionals;
pythonPackages = python.modules // rec {
inherit python;
inherit (pkgs) fetchurl fetchsvn fetchgit stdenv;
@ -108,19 +114,18 @@ let pythonPackages = python.modules // rec {
homepage = https://github.com/teythoon/afew;
description = "afew is an initial tagging script for notmuch mail.";
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
alot = buildPythonPackage rec {
rev = "5b5dbecb5a03840b751219db90bcf4dcffda315e";
rev = "6b5f1a8bf68eecf4364f97c71ec177cf715c081e";
name = "alot-0.3.3_${rev}";
src = fetchurl {
url = "https://github.com/pazz/alot/tarball/${rev}";
name = "${name}.tar.bz";
sha256 = "156q7x4wilhcgmaap7rjci3cgwm5ia85ddgx6xm6lfp5hkf5300v";
sha256 = "1l6b5gy0z549p54p2va1q7pxyiwb6ghqfy6gdm3kg1np9hw59rl4";
};
# error: invalid command 'test'
@ -137,7 +142,6 @@ let pythonPackages = python.modules // rec {
homepage = https://github.com/pazz/alot;
description = "Terminal MUA using notmuch mail";
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
@ -461,7 +465,6 @@ let pythonPackages = python.modules // rec {
description = "Simple, lightweight, and easily extensible STOMP message broker";
homepage = http://code.google.com/p/coilmq/;
license = pkgs.lib.licenses.asl20;
platforms = python.meta.platforms;
};
});
@ -481,16 +484,15 @@ let pythonPackages = python.modules // rec {
homepage = http://pypi.python.org/pypi/configobj;
license = pkgs.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
});
coverage = buildPythonPackage rec {
name = "coverage-3.5.3";
name = "coverage-3.6";
src = fetchurl {
url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz";
md5 = "5f1f523940c473faa8a9f6ca29f78efc";
md5 = "67d4e393f4c6a5ffc18605409d2aa1ac";
};
meta = {
@ -498,7 +500,6 @@ let pythonPackages = python.modules // rec {
homepage = http://nedbatchelder.com/code/coverage/;
license = pkgs.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = python.meta.platforms;
};
};
@ -603,33 +604,43 @@ let pythonPackages = python.modules // rec {
};
};
distribute = buildPythonPackage (rec {
name = "distribute-0.6.26";
distribute = stdenv.mkDerivation rec {
name = "distribute-0.6.34";
src = fetchurl {
url = "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.26.tar.gz";
md5 = "841f4262a70107f85260362f5def8206"; #"ecd75ea629fee6d59d26f88c39b2d291";
url = "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz";
md5 = "4576ab843a6db5100fb22a72deadf56d";
};
buildInputs = [ pkgs.unzip ];
buildInputs = [ python wrapPython offlineDistutils ];
installCommand =
''
# ehm, YES, the --verbose flags needs to be there, otherwise it tries to patch setuptools!
easy_install --verbose --prefix=$out .
'';
pythonPath = [ recursivePthLoader ];
# test for 27 fails
doCheck = false;
installPhase=''
dst="$out/lib/${python.libPrefix}/site-packages"
mkdir -p $dst
PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
export PYTHONPATH="$dst:$PYTHONPATH"
python setup.py install --prefix="$out"
eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
if [ -e "$eapth" ]; then
# move colliding easy_install.pth to specifically named one
mv "$eapth" $(dirname "$eapth")/${name}.pth
fi
rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
wrapPythonPrograms
'';
meta = {
description = "Easily download, build, install, upgrade, and uninstall Python packages";
homepage = http://packages.python.org/distribute;
license = "PSF or ZPL";
platforms = python.meta.platforms;
};
});
};
distutils2 = buildPythonPackage rec {
@ -858,11 +869,11 @@ let pythonPackages = python.modules // rec {
flake8 = buildPythonPackage (rec {
name = "flake8-1.6.2";
name = "flake8-1.7.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz";
md5 = "abfdbb25d37c28e9da05f1b5c3596d1a";
md5 = "a7830d1a6c23e889bc1fcaa4a87f53bd";
};
buildInputs = [ nose ];
@ -875,7 +886,6 @@ let pythonPackages = python.modules // rec {
homepage = http://pypi.python.org/pypi/flake8;
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
});
@ -939,7 +949,6 @@ let pythonPackages = python.modules // rec {
license = "MIT";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.meta.platforms;
};
});
@ -996,14 +1005,12 @@ let pythonPackages = python.modules // rec {
sha256 = "0bhiyx41kilvy04cgjbvjy2r4b6l7zz31fbrg3l6lvnqm26nihb0";
};
buildInputs = [ pkgs.setuptools ] ++
(if python.majorVersion == "2.6" then [ argparse ] else []);
buildInputs = [ pkgs.setuptools ] ++ (optional isPy26 argparse);
meta = {
description = "automatically generated zsh completion function for Python's option parser modules";
license = "BSD";
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = python.meta.platforms;
};
};
@ -1097,10 +1104,17 @@ let pythonPackages = python.modules // rec {
description = "A comprehensive HTTP client library";
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
importlib = if isPy26 then (buildPythonPackage {
name = "importlib-1.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz";
md5 = "4aa23397da8bd7c7426864e88e4db7e1";
};
doCheck = false;
}) else null;
iptools = buildPythonPackage rec {
version = "0.4.0";
@ -1136,6 +1150,15 @@ let pythonPackages = python.modules // rec {
};
};
ipdb = buildPythonPackage {
name = "ipdb-0.7";
src = fetchurl {
url = "http://pypi.python.org/packages/source/i/ipdb/ipdb-0.7.tar.gz";
md5 = "d879f9b2b0f26e0e999809585dcaec61";
};
propagatedBuildInputs = [ ipython ];
};
jedi = buildPythonPackage (rec {
name = "jedi-0.5b5";
@ -1149,7 +1172,6 @@ let pythonPackages = python.modules // rec {
description = "An autocompletion tool for Python that can be used for text editors.";
license = pkgs.lib.licenses.lgpl3Plus;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
});
@ -1202,7 +1224,7 @@ let pythonPackages = python.modules // rec {
sha256 = "11qilrs4sd4c1mkd64ikrjsc2vwrshhc54n5mh4xrark9c7ayp0y";
};
buildInputs = [ zopeInterface mock ];
buildInputs = [ zope_interface mock ];
preConfigure = "cp test/secrets.py-dist test/secrets.py";
@ -1445,7 +1467,7 @@ let pythonPackages = python.modules // rec {
md5 = "361c8ac7a31953ab94a95cf34d9a0b2b";
};
buildInputs = [ pkgs.unzip ];
buildInputs = [ pkgs.unzip six ] ++ (optionals isPy26 [ importlib ordereddict ]);
propagatedBuildInputs = [ argparse jinja2 ];
@ -1604,7 +1626,7 @@ let pythonPackages = python.modules // rec {
buildInputs = [ coverage ];
};
nose2 = buildPythonPackage rec {
nose2 = if isPy26 then null else (buildPythonPackage rec {
name = "nose2-0.4.5";
src = fetchurl {
url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz";
@ -1616,9 +1638,9 @@ let pythonPackages = python.modules // rec {
propagatedBuildInputs = [ six ];
# AttributeError: 'module' object has no attribute 'collector'
doCheck = false;
};
});
nose2Cov = buildPythonPackage rec {
nose2Cov = if isPy26 then null else (buildPythonPackage rec {
name = "nose2-cov-1.0a4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/n/nose2-cov/nose2-cov-1.0a4.tar.gz";
@ -1627,8 +1649,8 @@ let pythonPackages = python.modules // rec {
meta = {
description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing";
};
buildInputs = [ covCore nose2 ];
};
propagatedBuildInputs = [ covCore nose2 ];
});
notify = pkgs.stdenv.mkDerivation (rec {
name = "python-notify-0.1.1";
@ -1666,7 +1688,6 @@ let pythonPackages = python.modules // rec {
description = "A Python wrapper around notmuch";
homepage = http://notmuchmail.org/;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
@ -1743,6 +1764,15 @@ let pythonPackages = python.modules // rec {
# };
# });
ordereddict = if isPy26 then (buildPythonPackage {
name = "ordereddict-1.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz";
md5 = "a0ed854ee442051b249bfad0f638bbec";
};
doCheck = false;
}) else null;
ply = buildPythonPackage (rec {
name = "ply-3.2";
@ -1773,7 +1803,6 @@ let pythonPackages = python.modules // rec {
license = "revised-BSD";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.meta.platforms;
};
});
@ -1804,8 +1833,6 @@ let pythonPackages = python.modules // rec {
tunnel -- this is how sftp works, for example. it is written
entirely in python (no C or platform-dependent code) and is released
under the GNU LGPL (lesser GPL). '';
platforms = python.meta.platforms;
};
};
@ -1899,10 +1926,19 @@ let pythonPackages = python.modules // rec {
'';
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = python.meta.platforms;
};
};
pip = buildPythonPackage {
name = "pip-1.2.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz";
md5 = "db8a6d8a4564d3dc7f337ebed67b1a85";
};
buildInputs = [ mock scripttest virtualenv nose ];
# ValueError: Working directory tests not found, or not a directory
doCheck = false;
};
polib = buildPythonPackage rec {
name = "polib-${version}";
@ -2184,7 +2220,6 @@ let pythonPackages = python.modules // rec {
description = "A Python wrapper for the GPGME library.";
license = pkgs.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
};
@ -2417,7 +2452,6 @@ let pythonPackages = python.modules // rec {
license = "revised BSD";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.meta.platforms;
};
});
@ -2983,7 +3017,6 @@ let pythonPackages = python.modules // rec {
description = "Lightweight and extensible STOMP messaging client";
homepage = http://bitbucket.org/hozn/stompclient;
license = pkgs.lib.licenses.asl20;
platforms = python.meta.platforms;
};
});
@ -3116,7 +3149,7 @@ let pythonPackages = python.modules // rec {
md5 = "b7c2ff135939f605a8c54e1c13cd5d66";
};
propagatedBuildInputs = [ zopeInterface ];
propagatedBuildInputs = [ zope_interface ];
meta = {
description = "Transaction management";
@ -3135,7 +3168,7 @@ let pythonPackages = python.modules // rec {
md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7";
};
propagatedBuildInputs = [ zopeInterface zope_testing ];
propagatedBuildInputs = [ zope_interface zope_testing ];
meta = {
description = "A tool which computes a dependency graph between active Python eggs";
homepage = http://thomas-lotze.de/en/software/eggdeps/;
@ -3145,16 +3178,14 @@ let pythonPackages = python.modules // rec {
turses = buildPythonPackage (rec {
name = "turses-0.2.9";
name = "turses-0.2.11";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
sha256 = "c0f32fa31e2c5fa42f5cc19f3dba4e73f0438bf36bf756ba137f2423c0ac4637";
sha256 = "0zd0fjb5rr5if8wp6kmi29wrkj7ypp4vz00xxb0if1kjrakczlvm";
};
propagatedBuildInputs = [ oauth2 urwid tweepy ] ++
(if python.majorVersion == "2.6" then [ argparse ]
else []);
propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;
#buildInputs = [ tox ];
# needs tox
@ -3170,11 +3201,11 @@ let pythonPackages = python.modules // rec {
});
tweepy = buildPythonPackage (rec {
name = "tweepy-1.12";
name = "tweepy-1.13";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
sha256 = "66d728527ab3d5f5e4d6725654783f99169172678105f609d14353f6626c1315";
sha256 = "1gaki8qvzi72jaj5xls51lc6fgs1xnm9c6jgpirwklpdn7y8wyy5";
};
meta = {
@ -3194,7 +3225,7 @@ let pythonPackages = python.modules // rec {
sha256 = "110c30z622jn14yany1sxfaqj5qx20n9rc9zqacxlwma30fdcbjn";
};
propagatedBuildInputs = [ zopeInterface ];
propagatedBuildInputs = [ zope_interface ];
# Generate Twisted's plug-in cache. Twited users must do it as well. See
# http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
@ -3215,7 +3246,6 @@ let pythonPackages = python.modules // rec {
license = "MIT";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = python.meta.platforms;
};
};
@ -3273,7 +3303,6 @@ let pythonPackages = python.modules // rec {
homepage = http://excess.org/urwid;
license = pkgs.lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.garbas ];
platforms = python.meta.platforms;
};
});
@ -3478,16 +3507,17 @@ let pythonPackages = python.modules // rec {
description = "Structured Configuration Library";
homepage = http://pypi.python.org/pypi/ZConfig;
license = "ZPL";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zc_lockfile = buildPythonPackage rec {
name = "zc_lockfile-${version}";
name = "zc.lockfile-${version}";
version = "1.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-${version}.tar.gz";
url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz";
md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
};
@ -3495,6 +3525,7 @@ let pythonPackages = python.modules // rec {
description = "Inter-process locks";
homepage = http://www.python.org/pypi/zc.lockfile;
license = "ZPL";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
@ -3514,6 +3545,7 @@ let pythonPackages = python.modules // rec {
description = "A daemon process control library and tools for Unix-based systems";
homepage = http://pypi.python.org/pypi/zdaemon;
license = "ZPL";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
@ -3557,22 +3589,144 @@ let pythonPackages = python.modules // rec {
md5 = "6f180c6897a1820948fee2a6290503cd";
};
propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zopeInterface zope_event ];
propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event ];
meta = {
description = "An object-oriented database for Python";
homepage = http://pypi.python.org/pypi/ZODB3;
license = "ZPL";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_broken = buildPythonPackage rec {
name = "zope.broken-3.6.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.broken/${name}.zip";
md5 = "eff24d7918099a3e899ee63a9c31bee6";
};
buildInputs = [ pkgs.unzip zope_interface ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_browser = buildPythonPackage rec {
name = "zope.browser-1.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip";
md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
};
buildInputs = [ pkgs.unzip ];
propagatedBuildInputs = [ zope_interface ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_component = buildPythonPackage rec {
name = "zope.component-4.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.0.2.tar.gz";
md5 = "8c2fd4414ca23cbbe014dcaf911acebc";
};
propagatedBuildInputs = [
zope_configuration zope_event zope_i18nmessageid zope_interface
zope_testing
];
# ignore tests because of a circular dependency on zope_security
doCheck = false;
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_configuration = buildPythonPackage rec {
name = "zope.configuration-4.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.2.tar.gz";
md5 = "40b3c7ad0b748ede532d8cfe2544e44e";
};
propagatedBuildInputs = [ zope_i18nmessageid zope_schema ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_container = buildPythonPackage rec {
name = "zope.container-3.11.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz";
md5 = "fc66d85a17b8ffb701091c9328983dcc";
};
propagatedBuildInputs = [
zodb3 zope_broken zope_dottedname zope_publisher
zope_filerepresentation zope_lifecycleevent zope_size
zope_traversing
];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_contenttype = buildPythonPackage rec {
name = "zope.contenttype-3.5.5";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.zip";
md5 = "c6ac80e6887de4108a383f349fbdf332";
};
buildInputs = [ pkgs.unzip ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_dottedname = buildPythonPackage rec {
name = "zope.dottedname-3.4.6";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.dottedname/${name}.tar.gz";
md5 = "62d639f75b31d2d864fe5982cb23959c";
};
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_event = buildPythonPackage rec {
name = "zope_event-${version}";
name = "zope.event-${version}";
version = "4.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-${version}.tar.gz";
url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz";
md5 = "e08dd299d428d77a1cfcbfe841b81872";
};
@ -3580,83 +3734,285 @@ let pythonPackages = python.modules // rec {
description = "An event publishing system";
homepage = http://pypi.python.org/pypi/zope.event;
license = "ZPL";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_exceptions = buildPythonPackage rec {
name = "zopeexceptions-${version}";
name = "zope.exceptions-${version}";
version = "4.0.5";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-${version}.tar.gz";
url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz";
md5 = "c95569fcb444ae541777de7ae5297492";
};
propagatedBuildInputs = [ zopeInterface ];
propagatedBuildInputs = [ zope_interface ];
meta = {
description = "Exception interfaces and implementations";
homepage = http://pypi.python.org/pypi/zope.exceptions;
license = "ZPL";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_filerepresentation = buildPythonPackage rec {
name = "zope.filerepresentation-3.6.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/${name}.tar.gz";
md5 = "4a7a434094f4bfa99a7f22e75966c359";
};
propagatedBuildInputs = [ zope_schema ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_i18n = buildPythonPackage rec {
name = "zope.i18n-3.7.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz";
md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
};
propagatedBuildInputs = [ pytz zope_component ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_i18nmessageid = buildPythonPackage rec {
name = "zope.i18nmessageid-4.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.2.tar.gz";
md5 = "c4550f7a0b4a736186e6e0fa3b2471f7";
};
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_lifecycleevent = buildPythonPackage rec {
name = "zope.lifecycleevent-3.6.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz";
md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
};
propagatedBuildInputs = [ zope_event zope_component ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_location = buildPythonPackage rec {
name = "zope.location-4.0.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.0.tar.gz";
md5 = "cd0e10d5923c95e352bcde505cc11324";
};
propagatedBuildInputs = [ zope_proxy ];
# ignore circular dependency on zope_schema
installCommand = ''
easy_install --always-unzip --no-deps --prefix="$out" .
'';
doCheck = false;
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_proxy = buildPythonPackage rec {
name = "zope.proxy-4.1.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.1.tar.gz";
md5 = "c36691f0abee7573f4ddcc378603cefd";
};
propagatedBuildInputs = [ zope_interface ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_publisher = buildPythonPackage rec {
name = "zope.publisher-3.12.6";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.publisher/${name}.tar.gz";
md5 = "495131970cc7cb14de8e517fb3857ade";
};
propagatedBuildInputs = [
zope_browser zope_contenttype zope_i18n zope_security
];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_schema = buildPythonPackage rec {
name = "zope.schema-4.2.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
md5 = "e7e581af8193551831560a736a53cf58";
};
propagatedBuildInputs = [ zope_event zope_interface zope_testing ];
# ignore circular dependency on zope_location
installCommand = ''
easy_install --no-deps --prefix="$out" .
'';
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_security = buildPythonPackage rec {
name = "zope.security-3.7.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
md5 = "072ab8d11adc083eace11262da08630c";
};
propagatedBuildInputs = [
zope_component zope_configuration zope_i18nmessageid zope_schema
zope_proxy
];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_size = buildPythonPackage rec {
name = "zope.size-3.4.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz";
md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
};
propagatedBuildInputs = [ zope_i18nmessageid zope_interface ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_testing = buildPythonPackage rec {
name = "zope_testing-${version}";
name = "zope.testing-${version}";
version = "4.1.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-${version}.tar.gz";
url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
md5 = "2e3829841090d6adff718b8b73c87b6b";
};
propagatedBuildInputs = [ zopeInterface zope_exceptions ];
propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
meta = {
description = "Zope testing helpers";
homepage = http://pypi.python.org/pypi/zope.testing;
license = "ZPL";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_testrunner = buildPythonPackage rec {
name = "zope_testrunner-${version}";
name = "zope.testrunner-${version}";
version = "4.0.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.testrunner/zope.testrunner-${version}.zip";
url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip";
md5 = "cd648fc865a79aa0950e73342836dd4c";
};
buildInputs = [ pkgs.unzip ];
propagatedBuildInputs = [ subunit zopeInterface zope_exceptions zope_testing ];
propagatedBuildInputs = [ subunit zope_interface zope_exceptions zope_testing ];
meta = {
description = "A flexible test runner with layer support";
homepage = http://pypi.python.org/pypi/zope.testrunner;
license = "ZPL";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zopeInterface = buildPythonPackage {
name = "zope-interface-3.6.1";
zope_traversing = buildPythonPackage rec {
name = "zope.traversing-3.13.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.1.tar.gz";
sha256 = "294c3c0529e84169177bce78d616c768fa1c028a2fbc1854f615d32ed88dbc6c";
url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip";
md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
};
buildInputs = [ pkgs.unzip ];
propagatedBuildInputs = [ zope_location zope_security zope_publisher ];
meta = {
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
zope_interface = buildPythonPackage rec {
name = "zope.interface-4.0.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz";
md5 = "1ddd308f2c83703accd1696158c300eb";
};
propagatedBuildInputs = [ zope_event ];
meta = {
description = "Zope.Interface";
homepage = http://zope.org/Products/ZopeInterface;
license = "ZPL";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
};
};
# XXX: link broken
# hgsvn = buildPythonPackage rec {
# name = "hgsvn-0.1.8";
@ -3693,7 +4049,6 @@ let pythonPackages = python.modules // rec {
homepage = http://liw.fi/cliapp/;
description = "Python framework for Unix command line programs.";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3714,7 +4069,6 @@ let pythonPackages = python.modules // rec {
homepage = http://liw.fi/tracing/;
description = "Python debug logging helper.";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3735,7 +4089,6 @@ let pythonPackages = python.modules // rec {
homepage = http://liw.fi/ttystatus/;
description = "Progress and status updates on terminals for Python.";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3758,7 +4111,6 @@ let pythonPackages = python.modules // rec {
homepage = http://liw.fi/larch/;
description = "Python B-tree library.";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3778,7 +4130,6 @@ let pythonPackages = python.modules // rec {
homepage = http://graphite.wikidot.com/;
description = "Fixed size round-robin style database";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3791,7 +4142,7 @@ let pythonPackages = python.modules // rec {
sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg";
};
buildInputs = [ txamqp zopeInterface twisted ];
buildInputs = [ txamqp zope_interface twisted ];
propagatedBuildInputs = [ whisper ];
# error: invalid command 'test'
@ -3801,7 +4152,6 @@ let pythonPackages = python.modules // rec {
homepage = http://graphite.wikidot.com/;
description = "Backend data caching and persistence daemon for Graphite";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3820,7 +4170,6 @@ let pythonPackages = python.modules // rec {
homepage = https://launchpad.net/txamqp;
description = "Library for communicating with AMQP peers and brokers using Twisted";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};
@ -3842,7 +4191,6 @@ let pythonPackages = python.modules // rec {
homepage = http://graphite.wikidot.com/;
description = "Enterprise scalable realtime graphing";
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = python.meta.platforms;
};
};

2
pkgs/top-level/release.nix
View File

@ -47,7 +47,6 @@ with (import ./release-lib.nix);
chatzilla = linux;
cksfv = all;
classpath = linux;
consolekit = linux;
coreutils = all;
cpio = all;
cron = linux;
@ -349,7 +348,6 @@ with (import ./release-lib.nix);
};
firefox36Pkgs.firefox = linux;
firefox17Pkgs.firefox = linux;
firefox18Pkgs.firefox = linux;
gnome = {