mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge branch 'master' of github.com:NixOS/nixpkgs

Browse source
This commit is contained in:
Joachim Schiele 2013-08-11 10:22:11 +00:00
parent 0a0713eb27 d068505b2f
commit 06b3a158b4
29 changed files with 575 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
pkgs/applications/misc/vifm/default.nix
View file

@ -1,48 +1,31 @@
x@{builderDefsPackage
, ncurses
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11 }:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="vifm";
version="0.6.3";
name="${baseName}-${version}";
url="mirror://sourceforge/project/${baseName}/${baseName}/${name}.tar.bz2";
hash="1v5kiifjk7iyqrzjd94wn6a5dz4j3krl06pbp1ps9g3zdq2w2skv";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
let
name = "vifm-${version}";
version = "0.7.5";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
sha256 ="1r1d92zrff94rfx011dw2qsgdwd2ksqlz15la74d6h7sfcsnyd01";
};
inherit (sourceInfo) name version;
inherit buildInputs;
#phaseNames = ["doConfigure" "doMakeInstall"];
buildInputs = [ utillinux ncurses file libX11 ];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "A vi-like file manager";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl2;
maintainers = with pkgs.lib.maintainers; [ raskin garbas ];
platforms = pkgs.lib.platforms.linux;
license = pkgs.lib.licenses.gpl2;
};
passthru = {
updateInfo = {
downloadPage = "http://vifm.sf.net";
};
};
}) x
}

7
pkgs/applications/networking/browsers/midori/default.nix
View file

@ -12,6 +12,7 @@ let
gtksourceview pkgconfig which gettext makeWrapper
file libidn sqlite docutils libnotify libsoup vala
kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
glib_networking
];
in
rec {
@ -34,7 +35,11 @@ rec {
shebangsHere = (doPatchShebangs ".");
shebangsInstalled = (doPatchShebangs "$out/bin");
wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1");
wrapWK = (makeManyWrappers "$out/bin/*"
''
--set WEBKIT_IGNORE_SSL_ERRORS 1 \
--prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules"
'');
name = "midori-${version}.${release}";
meta = {

12
pkgs/applications/virtualization/virtualbox/default.nix
View file

@ -11,7 +11,7 @@ with stdenv.lib;
let
version = "4.2.14"; # changes ./guest-additions as well
version = "4.2.16"; # changes ./guest-additions as well
forEachModule = action: ''
for mod in \
@ -31,11 +31,13 @@ let
'';
# See https://github.com/NixOS/nixpkgs/issues/672 for details
extpackRevision = "86644";
extpackRevision = "86992";
extensionPack = requireFile rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
# Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e";
# IMPORTANT: Hash must be base16 encoded because it's used as an input to
# VBoxExtPackHelperApp!
# Tip: nix-hash --type sha256 --to-base16 "hash from nix-prefetch-url"
sha256 = "8f88b1ebe69b770103e9151bebf6681c5e049eb5fac45ae8d52c43440aa0fa0d";
message = ''
In order to use the extension pack, you need to comply with the VirtualBox Personal Use
and Evaluation License (PUEL) by downloading the related binaries from:
@ -54,7 +56,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = "038k65cdvr80da5nfan5r3rjrnxqab2fbf2pr2jq8g1gc4cxrxpq";
sha256 = "0nnl8qh8j4sk5zn78hrp6ccidmk332p7qg6pv5a0a4irs0b8j3zz";
};
buildInputs =

2
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a";
sha256 = "1id0rb2sdnn34rvjl2v3hp3z9g9c4s4f4kl1lx0myjlqv8i0fayg";
};
KERN_DIR = "${kernelDev}/lib/modules/*/build";

20
pkgs/development/libraries/libtxc_dxtn/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, autoconf, automake, libtool, mesa }:
let version = "1.0.1"; in
stdenv.mkDerivation rec {
name = "libtxc_dxtn-${version}";
src = fetchurl {
url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz";
sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv";
};
buildInputs = [ autoconf automake libtool mesa ];
preConfigure = "autoreconf -vfi";
meta = {
homepage = http://dri.freedesktop.org/wiki/S3TC;
};
}

20
pkgs/development/libraries/liburcu/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "0.7.7";
name = "liburcu-${version}";
src = fetchurl {
url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
sha256 = "1yxxnhrsy6sv6bmp7j96jjynnqns01zjgj94mk70jz54zvcagf4a";
};
meta = with stdenv.lib; {
description = "Userspace RCU (read-copy-update) library";
homepage = http://lttng.org/urcu;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

19
pkgs/development/libraries/libvisual/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, glib }:
stdenv.mkDerivation rec {
name = "libvisual-0.4.0";
src = fetchurl {
url = "mirror://sourceforge/libvisual/${name}.tar.gz";
sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b";
};
buildInputs = [ pkgconfig glib ];
meta = {
description = "An abstraction library for audio visualisations";
homepage = "http://sourceforge.net/projects/libvisual/";
license = stdenv.lib.licenses.lgpl21Plus;
platform = stdenv.lib.platforms.unix;
};
}

4
pkgs/development/tools/build-managers/leiningen/builder.sh
View file

@ -21,7 +21,3 @@ chmod -v 755 $out_bin
patchShebangs $out
wrapProgram $out_bin --prefix PATH ":" ${rlwrap}/bin
echo "Testing out \"lein version\"..."
$out_bin version
echo "Success."

14
pkgs/development/tools/build-managers/leiningen/default.nix
View file

@ -1,21 +1,21 @@
{stdenv, fetchurl, makeWrapper, openjdk, rlwrap, clojure }:
{ stdenv, fetchurl, makeWrapper, jdk, rlwrap, clojure }:
stdenv.mkDerivation rec {
pname = "leiningen";
version = "2.1.2";
version = "2.3.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy";
sha256 = "18rk1rr9il5jc3103cnmii6hyc1j3k12d975sqrcqyg97h7f0jkb";
};
jarsrc = fetchurl {
url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa";
sha256 = "04xmnw80f39qs2vfm5ic8bmhks1fvasiwg4snckg2zhfjkhzms05";
};
patches = ./lein_2.1.2.patch;
patches = ./lein_2.3.0.patch;
inherit rlwrap clojure;
@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ openjdk clojure ];
propagatedBuildInputs = [ jdk clojure ];
meta = {
homepage = https://github.com/technomancy/leiningen;
description = "Project automation for Clojure";
license = "EPL";
platforms = stdenv.lib.platforms.unix;
maintainer = with stdenv.lib.maintainers; [the-kenny];
maintainer = with stdenv.lib.maintainers; [ the-kenny ];
};
}

0
pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch → pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch
View file

21
pkgs/development/tools/misc/babeltrace/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt }:
stdenv.mkDerivation rec {
name = "babeltrace-1.1.1";
src = fetchurl {
url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
sha256 = "04jc1yd3aaq59fmpzswzc78cywpq7wzjfqdlsg7xc76ivb8cggfz";
};
buildInputs = [ pkgconfig glib libuuid popt ];
meta = with stdenv.lib; {
description = "Command-line tool and library to read and convert LTTng tracefiles";
homepage = http://www.efficios.com/babeltrace;
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

23
pkgs/development/tools/misc/lttng-tools/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }:
stdenv.mkDerivation rec {
name = "lttng-tools-2.2.3";
src = fetchurl {
url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
sha256 = "1p16n42j34xkaj17zg2g12rzkfwpdv9ay1h4bkdq6038v320mljv";
};
buildInputs = [ popt libuuid liburcu lttngUst ];
patches = [ ./lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch ];
meta = with stdenv.lib; {
description = "Tracing tools (kernel + user space) for Linux";
homepage = http://lttng.org/;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

53
pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch Normal file
View file

@ -0,0 +1,53 @@
From daba2e936571a236817022b760d91c48b730c30b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 9 Jul 2013 23:47:47 +0200
Subject: [PATCH] Change modprobe path from "/sbin/modprobe" to "modprobe"
(rely on PATH lookup)
---
src/bin/lttng-sessiond/modprobe.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 7e06dad..4075efe 100644
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -90,7 +90,7 @@ void modprobe_remove_lttng_control(void)
for (i = ARRAY_SIZE(kern_modules_control) - 1; i >= 0; i--) {
ret = snprintf(modprobe, sizeof(modprobe),
- "/sbin/modprobe -r -q %s",
+ "modprobe -r -q %s",
kern_modules_control[i].name);
if (ret < 0) {
PERROR("snprintf modprobe -r");
@@ -125,7 +125,7 @@ void modprobe_remove_lttng_data(void)
for (i = ARRAY_SIZE(kern_modules_list) - 1; i >= 0; i--) {
ret = snprintf(modprobe, sizeof(modprobe),
- "/sbin/modprobe -r -q %s",
+ "modprobe -r -q %s",
kern_modules_list[i].name);
if (ret < 0) {
PERROR("snprintf modprobe -r");
@@ -169,7 +169,7 @@ int modprobe_lttng_control(void)
for (i = 0; i < ARRAY_SIZE(kern_modules_control); i++) {
ret = snprintf(modprobe, sizeof(modprobe),
- "/sbin/modprobe %s%s",
+ "modprobe %s%s",
kern_modules_control[i].required ? "" : "-q ",
kern_modules_control[i].name);
if (ret < 0) {
@@ -205,7 +205,7 @@ int modprobe_lttng_data(void)
for (i = 0; i < ARRAY_SIZE(kern_modules_list); i++) {
ret = snprintf(modprobe, sizeof(modprobe),
- "/sbin/modprobe %s%s",
+ "modprobe %s%s",
kern_modules_list[i].required ? "" : "-q ",
kern_modules_list[i].name);
if (ret < 0) {
--
1.8.2.3

32
pkgs/development/tools/misc/lttng-ust/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ stdenv, fetchurl, liburcu }:
# NOTE:
# ./configure ...
# [...]
# LTTng-UST will be built with the following options:
#
# Java support (JNI): Disabled
# sdt.h integration: Disabled
# [...]
#
# Debian builds with std.h (systemtap).
stdenv.mkDerivation rec {
name = "lttng-ust-2.2.1";
src = fetchurl {
url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
sha256 = "0881ri3v96fjii24qnwgsypk4crri4qp6mc4zp7kwghz8gys9rla";
};
buildInputs = [ liburcu ];
meta = with stdenv.lib; {
description = "LTTng Userspace Tracer libraries";
homepage = http://lttng.org/;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

23
pkgs/development/tools/misc/lttv/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }:
stdenv.mkDerivation rec {
name = "lttv-1.5-beta1";
src = fetchurl {
url = "http://lttng.org/files/packages/${name}.tar.bz2";
sha256 = "0cz69q189wndwpvic0l6wvzl1nsfqadbrigaaxgzij72r7n89sfc";
};
buildInputs = [ pkgconfig glib gtk2 popt babeltrace ];
meta = with stdenv.lib; {
description = "Graphical trace viewer for LTTng trace files";
homepage = http://lttng.org/;
# liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
# The rest of the LTTV package is distributed under the GNU GPL v2.
license = with licenses; [ gpl2 lgpl21 ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

99
pkgs/games/steam/default.nix Normal file
View file

@ -0,0 +1,99 @@
{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc
, libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
, gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
, dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
, libxcb, libXau, libXdmcp, flashplayer, libSM, libICE, libXext
, dbus_glib, libusb1, networkmanager
, SDL # World of Goo
, libvorbis # Osmos
, curl, mesa # Superbrothers: S&S EP
, patchelf }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let version = "1.0.0.39"; in
stdenv.mkDerivation rec {
name = "steam-${version}";
src = fetchurl {
url = "http://repo.steampowered.com/steam/archive/precise/steam-launcher_${version}_all.deb";
sha256 = "1z1cnlr2qw2ndnqsfwjck9617m2p0f3p9q9409vczj909h2a9wyk";
};
buildInputs = [ dpkg makeWrapper ];
phases = "installPhase";
installPhase = ''
mkdir -p $out
dpkg-deb -x $src $out
cp -r $out/usr/* $out/
rm -rf $out/usr
substituteInPlace "$out/bin/steam" --replace "/usr/bin/env bash" "/bin/sh"
substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
sed -i 's,STEAMPACKAGE=.*,STEAMPACKAGE=steam,' $out/bin/steam
sed -i '/STEAMSCRIPT/d' $out/bin/steam
mv $out/bin/steam $out/bin/.steam-wrapped
cat > $out/bin/steam << EOF
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib:${libSM}/lib:${libICE}/lib:${dbus_glib}/lib:${networkmanager}/lib:${libXext}/lib:${libusb1}/lib
STEAMBOOTSTRAP=~/.steam/steam/steam.sh
if [ -f \$STEAMBOOTSTRAP ]; then
PLATFORM32=ubuntu12_32
STEAMCONFIG=~/.steam
STEAMROOT=~/.local/share/Steam
STEAMDATA="\$STEAMROOT"
PIDFILE="\$STEAMCONFIG/steam.pid"
STEAMBIN32LINK="\$STEAMCONFIG/bin32"
STEAMBIN64LINK="\$STEAMCONFIG/bin64"
STEAMSDK32LINK="\$STEAMCONFIG/sdk32"
STEAMSDK64LINK="\$STEAMCONFIG/sdk64"
STEAMROOTLINK="\$STEAMCONFIG/root"
STEAMDATALINK="\$STEAMCONFIG/steam"
STEAMSTARTING="\$STEAMCONFIG/starting"
# Create symbolic links for the Steam API
if [ ! -e "\$STEAMCONFIG" ]; then
mkdir "\$STEAMCONFIG"
fi
if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then
rm -f "\$STEAMBIN32LINK" && ln -s "\$STEAMROOT/\$PLATFORM32" "\$STEAMBIN32LINK"
rm -f "\$STEAMBIN64LINK" && ln -s "\$STEAMROOT/\$PLATFORM64" "\$STEAMBIN64LINK"
rm -f "\$STEAMSDK32LINK" && ln -s "\$STEAMROOT/linux32" "\$STEAMSDK32LINK"
rm -f "\$STEAMSDK64LINK" && ln -s "\$STEAMROOT/linux64" "\$STEAMSDK64LINK"
rm -f "\$STEAMROOTLINK" && ln -s "\$STEAMROOT" "\$STEAMROOTLINK"
if [ "\$STEAMDATALINK" ]; then
rm -f "\$STEAMDATALINK" && ln -s "\$STEAMDATA" "\$STEAMDATALINK"
fi
fi
# Temporary bandaid until everyone has the new libsteam_api.so
rm -f ~/.steampath && ln -s "\$STEAMCONFIG/bin32/steam" ~/.steampath
rm -f ~/.steampid && ln -s "\$PIDFILE" ~/.steampid
rm -f ~/.steam/bin && ln -s "\$STEAMBIN32LINK" ~/.steam/bin
export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib"
export SDL_VIDEO_X11_DGAMOUSE=0
cd "\$STEAMROOT"
FLASHLINK="\$STEAMCONFIG/bin32/plugins"
rm -f "\$FLASHLINK" && ln -s "${flashplayer}/lib/mozilla/plugins" "\$FLASHLINK"
LDSO="\$STEAMBIN32LINK/ld.so"
cp ${glibc}/lib/ld-linux.so.2 "\$LDSO"
chmod u+w "\$LDSO"
echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${glibc}/lib
exec "\$LDSO" "\$STEAMBIN32LINK/steam"
else
export PATH=${xz}/bin:\$PATH
exec $out/bin/.steam-wrapped
fi
EOF
chmod +x $out/bin/steam
'';
meta = {
description = "A digital distribution platform";
homepage = http://store.steampowered.com/;
license = "unfree";
};
}

11
pkgs/os-specific/linux/kernel/builder.sh
View file

@ -23,8 +23,6 @@ configurePhase() {
export INSTALL_PATH=$out
export INSTALL_MOD_PATH=$out
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
# Set our own localversion, if specified.
rm -f localversion*
if test -n "$localVersion"; then
@ -70,14 +68,9 @@ installPhase() {
cp vmlinux $out
if grep -q "CONFIG_MODULES=y" .config; then
# Install the modules in $out/lib/modules with matching paths
# in modules.dep (i.e., refererring to $out/lib/modules, not
# /lib/modules). The depmod_opts= is to prevent the kernel
# from passing `-b PATH' to depmod.
export MODULE_DIR=$out/lib/modules/
substituteInPlace Makefile --replace '-b $(INSTALL_MOD_PATH)' ''
# Install the modules in $out/lib/modules.
make modules_install \
DEPMOD=$module_init_tools/sbin/depmod depmod_opts= \
DEPMOD=$kmod/sbin/depmod \
$makeFlags "${makeFlagsArray[@]}" \
$installFlags "${installFlagsArray[@]}"

4
pkgs/os-specific/linux/kernel/generic.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, mktemp, module_init_tools, bc
{ stdenv, fetchurl, perl, mktemp, kmod, bc
, # The kernel source tarball.
src
@ -78,7 +78,7 @@ stdenv.mkDerivation {
generateConfig = ./generate-config.pl;
inherit preConfigure src module_init_tools localVersion postInstall postBuild;
inherit preConfigure src kmod localVersion postInstall postBuild;
patches = map (p: p.patch) kernelPatches;

11
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -139,4 +139,15 @@ rec {
};
};
# this patch will probably make it into 3.11 or 3.12
# it only touches 1 file (fs/btrfs/send.c) so it only affects people that use
# the btrfs send feature.
btrfs_send_backport =
{ name = "btrfs-send-check-parent-dir-when-doing-a-compare-send";
patch = fetchurl {
url = https://patchwork.kernel.org/patch/2839612/mbox;
sha256 = "0qv5mxpfrzj2dibac64n4b3d6pg7gzsafd11548bihwmsa3dlbhg";
};
};
}

8
pkgs/os-specific/linux/module-init-tools/aggregator.nix → pkgs/os-specific/linux/kmod/aggregator.nix
View file

@ -1,4 +1,4 @@
{stdenv, module_init_tools, modules, buildEnv}:
{ stdenv, kmod, modules, buildEnv }:
buildEnv {
name = "kernel-modules";
@ -8,20 +8,20 @@ buildEnv {
postBuild =
''
source ${stdenv}/setup
kernelVersion=$(cd $out/lib/modules && ls -d *)
if test "$(echo $kernelVersion | wc -w)" != 1; then
echo "inconsistent kernel versions: $kernelVersion"
exit 1
fi
echo "kernel version is $kernelVersion"
# Regenerate the depmod map files. Be sure to pass an explicit
# kernel version number, otherwise depmod will use `uname -r'.
if test -w $out/lib/modules/$kernelVersion; then
rm -f $out/lib/modules/$kernelVersion/modules.*
MODULE_DIR=$out/lib/modules/ ${module_init_tools}/sbin/depmod -a $kernelVersion
${kmod}/sbin/depmod -b $out -a $kernelVersion
fi
'';
}

31
pkgs/os-specific/linux/lttng-modules/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ stdenv, fetchurl, kernelDev }:
stdenv.mkDerivation rec {
pname = "lttng-modules-2.2.1";
name = "${pname}-${kernelDev.version}";
src = fetchurl {
url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2";
sha256 = "00ww1443ssv614s1ix6zby8llaf6zzlxcf5k4w7jsyji47ng33m2";
};
patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ];
preConfigure = ''
export KERNELDIR="${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build"
export INSTALL_MOD_PATH="$out"
'';
installPhase = ''
make modules_install
'';
meta = with stdenv.lib; {
description = "Linux kernel modules for LTTng tracing";
homepage = http://lttng.org/;
license = with licenses; [ lgpl21 gpl2 mit ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

33
pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch Normal file
View file

@ -0,0 +1,33 @@
When building against linux 3.2, we get this build error:
building /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o
CC [M] /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o
In file included from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:759:0,
from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/define_trace.h:148,
from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/ext3.h:868,
from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.c:48:
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3__page_op':
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3_invalidatepage':
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
/tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
because a check for existing ext3/*h files in the kernel build tree is skipped
for linux < 3.4. Fix it by extending the ext3_dep_check thing to also be run
when building against linux >= 3.2 (not only linux >= 3.4).
diff -uNr lttng-modules-2.2.0.orig/probes/Makefile lttng-modules-2.2.0/probes/Makefile
--- lttng-modules-2.2.0.orig/probes/Makefile 2013-06-19 03:22:44.000000000 +0200
+++ lttng-modules-2.2.0/probes/Makefile 2013-07-06 13:22:15.902957717 +0200
@@ -59,7 +59,7 @@
ext3_dep_check = $(wildcard $(ext3_dep))
ext3 = $(shell \
if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \
- if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 4 -a \
+ if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 2 -a \
-z "$(ext3_dep_check)" ] ; then \
echo "warn" ; \
exit ; \

6
pkgs/tools/filesystems/btrfsprogs/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs, lzo }:
let version = "0.20pre20130509"; in
let version = "0.20pre20130705"; in
stdenv.mkDerivation {
name = "btrfs-progs-${version}";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
rev = "650e656a8b9c1fbe4ec5cd8c48ae285b8abd3b69";
sha256 = "e50e8ce9d24505711ed855f69a73d639dc5e401692a7d1c300753de3472abb21";
rev = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f";
sha256 = "07c6762c9873cdcc1b9b3be0b412ba14b83457d8f5608d3dd945953b5e06f0f2";
};
buildInputs = [ zlib libuuid acl attr e2fsprogs lzo ];

30
pkgs/tools/misc/ponysay/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ stdenv, fetchurl, python3, texinfo, makeWrapper }:
stdenv.mkDerivation rec {
name = "ponysay-3.0.1";
src = fetchurl {
url = "https://github.com/erkin/ponysay/archive/3.0.1.tar.gz";
sha256 = "ab281f43510263b2f42a1b0a9097ee7831b3e33a9034778ecb12ccb51f6915ee";
};
buildInputs = [ python3 texinfo makeWrapper ];
phases = "unpackPhase patchPhase installPhase";
patches = [ ./pathfix.patch ];
installPhase = ''
python3 setup.py --prefix=$out --freedom=partial install --with-shared-cache=$out/share/ponysay
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
done
'';
meta = {
description = "cowsay reimplemention for ponies.";
homepage = http://terse.tk/ponysay/;
license = "GPLv3";
};
}

24
pkgs/tools/misc/ponysay/pathfix.patch Normal file
View file

@ -0,0 +1,24 @@
diff -urN ponysay-3.0.1/setup.py ponysay.p/setup.py
--- ponysay-3.0.1/setup.py 2013-04-05 14:28:18.000000000 +0200
+++ ponysay.p/setup.py 2013-08-10 01:09:30.181043877 +0200
@@ -514,7 +514,7 @@
for command in commands:
sourceed = 'completion/ponysay.%s' % (command)
generated = 'completion/%s-completion.%s' % (shell, command)
- generatorcmd = './completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
+ generatorcmd = 'python3 completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
Popen(generatorcmd.split(' ')).communicate()
if conf[command] is not None:
dest = generated + '.install'
@@ -559,9 +559,9 @@
for toolcommand in ('--dimensions', '--metadata'):
if not self.free:
print('%s, %s, %s' % ('./src/ponysaytool.py', toolcommand, sharedir))
- Popen(['./src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
+ Popen(['python3', './src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
else:
- params = ['./src/ponysaytool.py', toolcommand, sharedir, '--']
+ params = ['python3', './src/ponysaytool.py', toolcommand, sharedir, '--']
for sharefile in os.listdir(sharedir):
if sharefile.endswith('.pony') and (sharefile != '.pony'):
if not Setup.validateFreedom(sharedir + '/' + sharefile):

4
pkgs/tools/misc/unclutter/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation {
make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man
'';
meta = {
meta = with stdenv.lib; {
description = "Hides mouse pointer while not in use.";
longDescription = ''
Unclutter hides your X mouse cursor when you do not need it, to prevent
@ -28,5 +28,7 @@ stdenv.mkDerivation {
unclutter -idle 1 &
'';
maintainers = with maintainers; [ iElectric ];
platforms = platforms.unix;
};
}

29
pkgs/tools/security/torbutton/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ stdenv, fetchgit, zip }:
stdenv.mkDerivation rec {
name = "torbutton-${version}.xpi";
version = "1.6.1";
src = fetchgit {
url = https://git.torproject.org/torbutton.git;
rev = "refs/tags/${version}";
sha256 = "0ypzrl8nhckrgh45rcwsjds1jnzz3w5nr09b926a4h3a5njammlv";
};
buildInputs = [ zip ];
buildPhase = ''
mkdir pkg
./makexpi.sh
'';
installPhase = "cat pkg/*.xpi > $out";
meta = with stdenv.lib; {
homepage = https://www.torproject.org/torbutton/;
description = "the component in Tor Browser Bundle that takes care of application-level security and privacy concerns in Firefox. To keep you safe, Torbutton disables many types of active content.";
license = licenses.mit;
maintainers = [ maintainers.phreedom ];
platforms = platforms.linux;
};
}

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

@ -1526,6 +1526,8 @@ let
polkit_gnome = callPackage ../tools/security/polkit-gnome { };
ponysay = callPackage ../tools/misc/ponysay { };
povray = callPackage ../tools/graphics/povray { };
ppl = callPackage ../development/libraries/ppl { };
@ -1786,6 +1788,8 @@ let
tor = callPackage ../tools/security/tor { };
torbutton = callPackage ../tools/security/torbutton { };
torsocks = callPackage ../tools/security/tor/torsocks.nix { };
trickle = callPackage ../tools/networking/trickle {};
@ -1828,7 +1832,7 @@ let
vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
vifm = callPackage ../applications/misc/vifm {};
vifm = callPackage ../applications/misc/vifm { };
viking = callPackage ../applications/misc/viking {
inherit (gnome) scrollkeeper;
@ -3300,6 +3304,8 @@ let
avarice = callPackage ../development/tools/misc/avarice { };
babeltrace = callPackage ../development/tools/misc/babeltrace { };
bam = callPackage ../development/tools/build-managers/bam {};
binutils = callPackage ../development/tools/misc/binutils {
@ -3540,6 +3546,12 @@ let
ltrace = callPackage ../development/tools/misc/ltrace { };
lttngTools = callPackage ../development/tools/misc/lttng-tools { };
lttngUst = callPackage ../development/tools/misc/lttng-ust { };
lttv = callPackage ../development/tools/misc/lttv { };
mk = callPackage ../development/tools/build-managers/mk { };
neoload = callPackage ../development/tools/neoload {
@ -4844,6 +4856,8 @@ let
libtunepimp = callPackage ../development/libraries/libtunepimp { };
libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
libgeotiff = callPackage ../development/libraries/libgeotiff { };
libunistring = callPackage ../development/libraries/libunistring { };
@ -4856,6 +4870,8 @@ let
libunique = callPackage ../development/libraries/libunique/default.nix { };
liburcu = callPackage ../development/libraries/liburcu { };
libusb = callPackage ../development/libraries/libusb {
stdenv = if stdenv.isDarwin
then overrideGCC stdenv gccApple
@ -4882,6 +4898,8 @@ let
libvisio = callPackage ../development/libraries/libvisio { };
libvisual = callPackage ../development/libraries/libvisual { };
libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) {
inherit libtool libjpeg openssl zlib;
inherit (xlibs) xproto libX11 damageproto libXdamage
@ -6377,7 +6395,7 @@ let
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_0
@ -6385,7 +6403,7 @@ let
};
linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_2
@ -6411,7 +6429,7 @@ let
});
linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_4
@ -6430,11 +6448,11 @@ let
});
linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
};
linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
@ -6446,10 +6464,11 @@ let
};
linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
kernelPatches.btrfs_send_backport
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
@ -6506,6 +6525,8 @@ let
iwlwifi4965ucode = iwlwifi4965ucodeV2;
lttngModules = callPackage ../os-specific/linux/lttng-modules { };
atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };
broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
@ -6647,8 +6668,8 @@ let
mountall = callPackage ../os-specific/linux/mountall { };
aggregateModules = modules:
import ../os-specific/linux/module-init-tools/aggregator.nix {
inherit stdenv module_init_tools modules buildEnv;
callPackage ../os-specific/linux/kmod/aggregator.nix {
inherit modules;
};
multipath_tools = callPackage ../os-specific/linux/multipath-tools { };
@ -7998,7 +8019,7 @@ let
midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
inherit imagemagick intltool python pkgconfig webkit libxml2
which gettext makeWrapper file libidn sqlite docutils libnotify
vala dbus_glib;
vala dbus_glib glib_networking;
inherit gtk3 glib;
inherit (gnome) gtksourceview;
inherit (webkit.passthru.args) libsoup;
@ -9030,6 +9051,8 @@ let
stardust = callPackage ../games/stardust {};
steam = callPackage_i686 ../games/steam {};
stuntrally = callPackage ../games/stuntrally { };
superTux = callPackage ../games/super-tux { };

23
pkgs/top-level/python-packages.nix
View file

@ -3822,6 +3822,26 @@ pythonPackages = modules // rec {
};
});
pycurl2 = buildPythonPackage (rec {
name = "pycurl2-7.20.0";
src = fetchgit {
url = "https://github.com/Lispython/pycurl.git";
rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
sha256 = "0mhg7f9y5zl0m2xgz3rf1yqjd6l8n0qhfk7bpf36r44jfnhj75ld";
};
buildInputs = [ pkgs.curl simplejson unittest2 nose ];
meta = {
homepage = https://pypi.python.org/pypi/pycurl2;
description = "A fork from original PycURL library that no maintained from 7.19.0";
platforms = stdenv.lib.platforms.linux;
};
});
pydot = buildPythonPackage rec {
name = "pydot-1.0.2";
@ -6399,8 +6419,7 @@ pythonPackages = modules // rec {
sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg";
};
buildInputs = [ txamqp zope_interface twisted ];
propagatedBuildInputs = [ whisper ];
propagatedBuildInputs = [ whisper txamqp zope_interface twisted ];
# error: invalid command 'test'
doCheck = false;