Merge remote-tracking branch 'upstream/master' into haskell-ListZipper
This commit is contained in:
Alexander Foremny
commit
7cc6e0b379
@ -88,14 +88,6 @@ let
|
||||
pre23 = versionOlder sourceInfo.version "23.0.0.0";
|
||||
in optional pre23 ./enable_seccomp.patch;
|
||||
|
||||
maybeBpfTemporaryFix = let
|
||||
patch = fetchurl {
|
||||
url = "https://chromiumcodereview.appspot.com/download/issue11073003_6001_7001.diff";
|
||||
sha256 = "bf61871cdaa8fea27ce15482a17048f67b426a55813c3832f9bd39ec47a9eb06";
|
||||
};
|
||||
needPatch = !versionOlder sourceInfo.version "23.0.1271.0";
|
||||
in optional needPatch patch;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${packageName}-${version}";
|
||||
packageName = "chromium";
|
||||
@ -129,8 +121,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
patches = optional cfg.cups ./cups_allow_deprecated.patch
|
||||
++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch
|
||||
++ maybeSeccompPatch
|
||||
++ maybeBpfTemporaryFix;
|
||||
++ maybeSeccompPatch;
|
||||
|
||||
postPatch = optionalString cfg.openssl ''
|
||||
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
dev = {
|
||||
version = "24.0.1284.2";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1284.2.tar.bz2";
|
||||
sha256 = "0lp3r4n3d71wy2ndzcfwvrp9vc1ii98pxip1c8hfinz994ca1ykx";
|
||||
version = "24.0.1297.0";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1297.0.tar.bz2";
|
||||
sha256 = "1qwqpj5xnv9fsi8k79c6fzlry32h47w6chxabz3l819c008yrqa4";
|
||||
};
|
||||
beta = {
|
||||
version = "23.0.1271.26";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.26.tar.bz2";
|
||||
sha256 = "1iimpmm5lm5rvak49320lmmvwqr8xv4znp4h1pf65jzzx0apbgkh";
|
||||
version = "23.0.1271.40";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.40.tar.bz2";
|
||||
sha256 = "151yp9rw7v693mw4glmswl7ls2yx3zk0sz1n646brs5wrnbci9l0";
|
||||
};
|
||||
stable = {
|
||||
version = "22.0.1229.94";
|
||||
|
||||
@ -1,181 +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
|
||||
|
||||
, # 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 = "12.0";
|
||||
|
||||
xulVersion = "12.0"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
|
||||
sha1 = "0177185e54b7d63dc36bd5bd5c80ba6afd52e199";
|
||||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
[ "--enable-optimize"
|
||||
"--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
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=xulrunner"
|
||||
"--disable-javaxpcom"
|
||||
] ++ commonConfigureFlags;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# 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]))
|
||||
}' ';'
|
||||
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
|
||||
'';
|
||||
|
||||
# !!! Temporary hack.
|
||||
preBuild =
|
||||
''
|
||||
export NIX_ENFORCE_PURITY=
|
||||
'';
|
||||
|
||||
installFlags = "SKIP_GRE_REGISTRATION=1";
|
||||
|
||||
postInstall = ''
|
||||
# Fix some references to /bin paths in the Xulrunner shell script.
|
||||
substituteInPlace $out/bin/xulrunner \
|
||||
--replace /bin/pwd "$(type -tP pwd)" \
|
||||
--replace /bin/ls "$(type -tP ls)"
|
||||
|
||||
# Fix run-mozilla.sh search
|
||||
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
|
||||
echo libDir: $libDir
|
||||
test -n "$libDir"
|
||||
cd $out/bin
|
||||
mv xulrunner ../lib/$libDir/
|
||||
|
||||
for i in $out/lib/$libDir/*; do
|
||||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
|
||||
chmod a+x "$out/bin/$(basename "$i")";
|
||||
fi;
|
||||
done;
|
||||
for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
|
||||
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
|
||||
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
|
||||
];
|
||||
|
||||
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";
|
||||
|
||||
# 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
|
||||
for j in $out/bin/*; do
|
||||
i="$(readlink "$j")";
|
||||
file $i;
|
||||
if file $i | grep executable &>/dev/null; then
|
||||
rm "$out/bin/$(basename "$i")"
|
||||
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
|
||||
chmod a+x "$out/bin/$(basename "$i")"
|
||||
fi;
|
||||
done;
|
||||
''; # */
|
||||
|
||||
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;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
version = "4.2.0";
|
||||
version = "4.2.2";
|
||||
|
||||
forEachModule = action: ''
|
||||
for mod in \
|
||||
@ -34,7 +34,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
|
||||
sha256 = "895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6";
|
||||
sha256 = "943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -44,7 +44,9 @@ in stdenv.mkDerivation {
|
||||
++ optional javaBindings jdk
|
||||
++ optional pythonBindings python;
|
||||
|
||||
patchPhase = ''
|
||||
patches = [ ./remove_fa_ir.patch ];
|
||||
|
||||
postPatch = ''
|
||||
set -x
|
||||
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
|
||||
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
|
||||
@ -110,6 +112,12 @@ in stdenv.mkDerivation {
|
||||
mkdir -p $out/share/applications
|
||||
sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop
|
||||
ln -sfv $libexec/virtualbox.desktop $out/share/applications
|
||||
# Icons
|
||||
mkdir -p $out/share/icons/hicolor
|
||||
for size in `ls -1 $libexec/icons`; do
|
||||
mkdir -p $out/share/icons/hicolor/$size/apps
|
||||
ln -s $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
|
||||
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}:
|
||||
|
||||
let version = "4.2.0"; in
|
||||
let version = "4.2.2"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "VirtualBox-GuestAdditions-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3";
|
||||
sha256 = "26f5390b36a3bb9855846d194dcd287b8e53613b599c6ffd7aff1b451cc7f1f1";
|
||||
};
|
||||
|
||||
KERN_DIR = "${kernel}/lib/modules/*/build";
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
This patch is for VirtualBox-4.2.2, to temporarily remove references to the
|
||||
fa_IR language file from the source tree, as it somehow got lost during tarball
|
||||
creation. For more information on this subject please have a look at:
|
||||
|
||||
https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html
|
||||
|
||||
diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro
|
||||
index ffeb410..37ac56a 100644
|
||||
--- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro
|
||||
+++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro
|
||||
@@ -63,7 +63,6 @@ TRANSLATIONS = \
|
||||
nls/VirtualBox_es.ts \
|
||||
nls/VirtualBox_eu.ts \
|
||||
nls/VirtualBox_fi.ts \
|
||||
- nls/VirtualBox_fa_IR.ts \
|
||||
nls/VirtualBox_fr.ts \
|
||||
nls/VirtualBox_gl_ES.ts \
|
||||
nls/VirtualBox_hu.ts \
|
||||
diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
|
||||
index 66f0ec3..2fc19b9 100644
|
||||
--- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
|
||||
+++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
|
||||
@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \
|
||||
de \
|
||||
en \
|
||||
es \
|
||||
- fa_IR \
|
||||
hu \
|
||||
it \
|
||||
ja \
|
||||
@ -4,15 +4,12 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xmonad-extras";
|
||||
version = "0.10.1.1";
|
||||
sha256 = "1pkp9z58w2x8yhxhvm5nifxb1qcajv52ji53n77rjhpysvrgq5m7";
|
||||
version = "0.10.1.2";
|
||||
sha256 = "1v0yhi3sw7qks8d13amps0qs5p90j3prjh5abm02wblcd0bm1xay";
|
||||
buildDepends = [
|
||||
hint libmpd mtl network parsec random regexPosix split X11 xmonad
|
||||
xmonadContrib
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -i xmonad-extras.cabal -e 's|split .*|split|'
|
||||
'';
|
||||
configureFlags = "-f-with_hlist -fwith_split -fwith_parsec";
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/xmonad-extras";
|
||||
|
||||
@ -12,7 +12,7 @@ fi
|
||||
|
||||
header "getting $url $partial ${tagtext} into $out"
|
||||
|
||||
darcs get --lazy --ephemeral $tagflags "$url" "$out"
|
||||
darcs get --lazy $tagflags "$url" "$out"
|
||||
# remove metadata, because it can change
|
||||
rm -rf "$out/_darcs"
|
||||
|
||||
|
||||
22
pkgs/desktops/xfce-4.8/applications/gigolo.nix
Normal file
22
pkgs/desktops/xfce-4.8/applications/gigolo.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gigolo-0.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.xfce.org/src/apps/gigolo/0.4/${name}.tar.bz2";
|
||||
sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2";
|
||||
};
|
||||
|
||||
buildInputs = [ python gettext intltool gtk pkgconfig gvfs];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i "waf" -e "1 s^.*/env[ ]*python^#!${python}/bin/python^";
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://goodies.xfce.org/projects/applications/gigolo;
|
||||
description = "Gigolo is a frontend to easily manage connections to remote filesystems";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
18
pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix
Normal file
18
pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl, intltool, pkgconfig, gtk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xfce4-taskmanager-1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.xfce.org/src/apps/xfce4-taskmanager/1.0/${name}.tar.bz2";
|
||||
sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0";
|
||||
};
|
||||
|
||||
buildInputs = [ intltool pkgconfig gtk ];
|
||||
|
||||
meta = {
|
||||
homepage = http://goodies.xfce.org/projects/applications/xfce4-taskmanager;
|
||||
description = "Easy to use task manager for XFCE";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
24
pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch
Normal file
24
pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff --git a/panel/panel-module-factory.c b/panel/panel-module-factory.c
|
||||
index 529fe85..8c792b7 100644
|
||||
--- a/panel/panel-module-factory.c
|
||||
+++ b/panel/panel-module-factory.c
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <panel/panel-module.h>
|
||||
#include <panel/panel-module-factory.h>
|
||||
|
||||
+#define DATADIR "/run/current-system/sw/share/xfce4"
|
||||
#define PANEL_PLUGINS_DATA_DIR (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
|
||||
#define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins")
|
||||
|
||||
diff --git a/panel/panel-module.c b/panel/panel-module.c
|
||||
index ba39320..519440b 100644
|
||||
--- a/panel/panel-module.c
|
||||
+++ b/panel/panel-module.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <panel/panel-plugin-external-wrapper.h>
|
||||
#include <panel/panel-plugin-external-46.h>
|
||||
|
||||
+#define LIBDIR "/run/current-system/sw/lib/xfce4"
|
||||
#define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
|
||||
#define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins")
|
||||
|
||||
@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
|
||||
sha1 = "332fc968332e6271e1bb65d6de8de2524b0440ec";
|
||||
};
|
||||
|
||||
patches = [ ./xfce4-panel-datadir.patch ];
|
||||
patchFlags = "-p1";
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig intltool gtk libxfce4util garcon libxfce4ui xfconf
|
||||
exo libwnck
|
||||
|
||||
@ -67,6 +67,8 @@ rec {
|
||||
inherit (pkgs.gnome) vte;
|
||||
};
|
||||
|
||||
gigolo = callPackage ./applications/gigolo.nix { };
|
||||
|
||||
mousepad = callPackage ./applications/mousepad.nix { };
|
||||
|
||||
ristretto = callPackage ./applications/ristretto.nix { };
|
||||
@ -75,9 +77,16 @@ rec {
|
||||
|
||||
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
|
||||
|
||||
xfce4_taskmanager = callPackage ./applications/xfce4-taskmanager.nix { };
|
||||
|
||||
|
||||
#### ART
|
||||
|
||||
xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
|
||||
|
||||
#### PANEL PLUGINS
|
||||
|
||||
xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix {};
|
||||
xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix {};
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xfce4-cpufreq-plugin-1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.0/${name}.tar.bz2";
|
||||
sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xfce.org/;
|
||||
description = "CPU Freq load panel plugin for Xfce";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xfce4-systemload-plugin-1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.1/${name}.tar.bz2";
|
||||
sha256 = "1bnrr30h6kgb37ixcq7frx2gvj2p99bpa1jyzppwjxp5x7xkxh8s";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.xfce.org/;
|
||||
description = "System load panel plugin for Xfce";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "HTTP";
|
||||
version = "4000.2.5";
|
||||
sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7";
|
||||
version = "4000.2.6";
|
||||
sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92";
|
||||
buildDepends = [ mtl network parsec ];
|
||||
meta = {
|
||||
homepage = "https://github.com/haskell/HTTP";
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Stream";
|
||||
version = "0.4.6";
|
||||
sha256 = "0ppjcddm8dxxd260dsnzrdijifg4pa66lm401qj4fiddw0b50wzb";
|
||||
version = "0.4.6.1";
|
||||
sha256 = "19z052rd0varq5cbw0i0f0vkbpb40kqg6i93kz2brk6a101q5llp";
|
||||
buildDepends = [ lazysmallcheck QuickCheck ];
|
||||
meta = {
|
||||
description = "A library for manipulating infinite lists";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "async";
|
||||
version = "2.0.1.3";
|
||||
sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh";
|
||||
version = "2.0.1.4";
|
||||
sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1";
|
||||
buildDepends = [ stm ];
|
||||
meta = {
|
||||
homepage = "https://github.com/simonmar/async";
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "authenticate";
|
||||
version = "1.3.1.1";
|
||||
sha256 = "120n7z22x4y4ngxqxsi65zn992f1lksaawcd7rmjvf8m0fysbb4n";
|
||||
version = "1.3.1.2";
|
||||
sha256 = "1hcil0hmv47jvjvkm9plaizpyrd8z5xazwb3spsa29q0pf3isaxi";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
|
||||
conduit httpConduit httpTypes monadControl network resourcet
|
||||
|
||||
@ -5,8 +5,10 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "distributed-process-simplelocalnet";
|
||||
version = "0.2.0.6";
|
||||
sha256 = "1mgsmxxy1fcbxh8p82078c70fj7iv6wr8g47r4d0c3jwz84xya57";
|
||||
version = "0.2.0.7";
|
||||
sha256 = "0jxbxacvdg4pf65s6r48nck45g8dfsarks3m2pdn73gjn4cd81c7";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
binary dataAccessor distributedProcess network networkMulticast
|
||||
networkTransport networkTransportTcp transformers
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "distributed-process";
|
||||
version = "0.4.0.1";
|
||||
sha256 = "0yi0403665l01gkqbsix9f4hj8c8m4i42nwjq2i63x259qz2njwi";
|
||||
version = "0.4.0.2";
|
||||
sha256 = "0wjxai5z6m84blrgic1pd0jgivqcc8ymjya3m0dhqbmsljwh6ynw";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
12
pkgs/development/libraries/haskell/elerea/default.nix
Normal file
12
pkgs/development/libraries/haskell/elerea/default.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "elerea";
|
||||
version = "2.7.0.2";
|
||||
sha256 = "1n45q1hx548c6yqbj3321lky3xxsffpqvmcq0m9hw36d3cvwbvg0";
|
||||
meta = {
|
||||
description = "A minimalistic FRP library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -4,15 +4,14 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "filestore";
|
||||
version = "0.5";
|
||||
sha256 = "0cppm8iksz4dnh4kafyfy0cqbidw83rdpgc1mksiwh9c9gaxrlq7";
|
||||
version = "0.5.0.1";
|
||||
sha256 = "1wbiw3skbbcqi9p97xnhg5lnakq3vyan9v4f68wd3g4swk09xp7l";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
Diff filepath HUnit mtl parsec split time utf8String xml
|
||||
];
|
||||
noHaddock = true;
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
description = "Interface for versioning file stores";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ cabal, Cabal, emacs, filepath, ghcPaths, ghcSybUtils, hlint
|
||||
, ioChoice, regexPosix, syb, transformers
|
||||
{ cabal, Cabal, convertible, emacs, filepath, ghcPaths, ghcSybUtils
|
||||
, hlint, ioChoice, regexPosix, syb, time, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "ghc-mod";
|
||||
version = "1.11.0";
|
||||
sha256 = "19cx6jhciww2xgad3q35h3jlwiv9s9b6na2qi1cbga7p77swarsv";
|
||||
version = "1.11.1";
|
||||
sha256 = "1mhmcckpijg44h3njcdkssz72a3x0222gqc2fs477fymcmczv2q3";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
Cabal filepath ghcPaths ghcSybUtils hlint ioChoice regexPosix syb
|
||||
transformers
|
||||
Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice
|
||||
regexPosix syb time transformers
|
||||
];
|
||||
buildTools = [ emacs ];
|
||||
postInstall = ''
|
||||
|
||||
@ -2,10 +2,9 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "happstack-hamlet";
|
||||
version = "7.0.1";
|
||||
sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n";
|
||||
version = "7.0.2";
|
||||
sha256 = "0hsmvv5rggyl7sa4sp30zyr43k6zj7dlpd0mb916wzcqrnyxa34a";
|
||||
buildDepends = [ hamlet happstackServer text ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://www.happstack.com/";
|
||||
description = "Support for Hamlet HTML templates in Happstack";
|
||||
|
||||
@ -4,13 +4,12 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hledger-lib";
|
||||
version = "0.18.2";
|
||||
sha256 = "0lcs58bdix4m7sslrdi38rqw5x5fb4ip0n5is0phxdrbp0nggd4z";
|
||||
version = "0.19";
|
||||
sha256 = "1kbjal838b3k0rmvdrndmyjngvyfwpmzh6y8kir4l2nf31jxwjbs";
|
||||
buildDepends = [
|
||||
cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText
|
||||
split time transformers utf8String
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://hledger.org";
|
||||
description = "Core data types, parsers and utilities for the hledger accounting tool";
|
||||
|
||||
@ -1,19 +1,18 @@
|
||||
{ cabal, cabalFileTh, cmdargs, filepath, haskeline, hledgerLib
|
||||
, HUnit, mtl, parsec, regexpr, safe, shakespeareText, split, text
|
||||
, time, utf8String
|
||||
{ cabal, cmdargs, filepath, haskeline, hledgerLib, HUnit, mtl
|
||||
, parsec, regexpr, safe, shakespeareText, split, text, time
|
||||
, utf8String
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hledger";
|
||||
version = "0.18.2";
|
||||
sha256 = "1i0rix3h5vrq9j01fzgwyhs2n8nfzhidi4rjlvn402ps0w6j15ld";
|
||||
version = "0.19";
|
||||
sha256 = "0pl280vlwwsnl3grsbl5yv8kli1prkswa0p9j2s13g8m89srd1vf";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec
|
||||
regexpr safe shakespeareText split text time utf8String
|
||||
cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe
|
||||
shakespeareText split text time utf8String
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://hledger.org";
|
||||
description = "The main command-line interface for the hledger accounting tool";
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
{ cabal, binary, bitmap, bytestringTrie, filepath, mtl, OpenGLRaw
|
||||
, stbImage, uulib, vect, vector, vectorAlgorithms, xml, zipArchive
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lambdacube-engine";
|
||||
version = "0.2.4";
|
||||
sha256 = "1xdp10nylndmfw16dywqrxj30g99rf9qbcx5qiglvzm1c1kxid3f";
|
||||
buildDepends = [
|
||||
binary bitmap bytestringTrie filepath mtl OpenGLRaw stbImage uulib
|
||||
vect vector vectorAlgorithms xml zipArchive
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
|
||||
description = "3D rendering engine written entirely in Haskell";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "language-javascript";
|
||||
version = "0.5.6";
|
||||
sha256 = "1a1nki2z7x0rna5jg6g0gqnipvd115k4xgagg6prrvj284ml44wd";
|
||||
version = "0.5.7";
|
||||
sha256 = "0mndz0bqxkayzm7g92cvai9ahb9msr99syp9djhaya1d45595ad3";
|
||||
buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
|
||||
buildTools = [ happy ];
|
||||
meta = {
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "network-transport-tcp";
|
||||
version = "0.3.0";
|
||||
sha256 = "0x2rz0h890bfay52af2wcvja706dr4r6wgfs9csjf7y3jf53nc63";
|
||||
version = "0.3.1";
|
||||
sha256 = "15i4qbx1s3dxaixn6kd2z1hsymfvpqzf4jpqd3mcbpjlgrn6craf";
|
||||
buildDepends = [ dataAccessor network networkTransport ];
|
||||
meta = {
|
||||
homepage = "http://github.com/haskell-distributed/distributed-process";
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pandoc";
|
||||
version = "1.9.4.2";
|
||||
sha256 = "1zr2qx6bimyhzia5maqpb454hgdwjvgs234mcki4f1z3dgbq0lsk";
|
||||
version = "1.9.4.5";
|
||||
sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
@ -17,7 +17,6 @@ cabal.mkDerivation (self: {
|
||||
time utf8String xml zipArchive zlib
|
||||
];
|
||||
configureFlags = "-fblaze_html_0_5";
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://johnmacfarlane.net/pandoc";
|
||||
description = "Conversion between markup formats";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "sendfile";
|
||||
version = "0.7.6";
|
||||
sha256 = "0wqbnr07s3g7f6p4x27ips9nzjjz1ii5hw1q54i31g40jzv8rs7z";
|
||||
version = "0.7.7";
|
||||
sha256 = "0pwzgmgc87xms4r7pqymq56qgi601pk195kj62rll05qip6mrba0";
|
||||
buildDepends = [ network ];
|
||||
meta = {
|
||||
homepage = "http://patch-tag.com/r/mae/sendfile";
|
||||
homepage = "http://hub.darcs.net/stepcut/sendfile";
|
||||
description = "A portable sendfile library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "silently";
|
||||
version = "1.2.3";
|
||||
sha256 = "1fvkj5qngdi2zxsrfk6dnaynm0wbxpmqr0jzvzayxifhzh04mqld";
|
||||
version = "1.2.4";
|
||||
sha256 = "0ac75b4n9566vpvv6jfcqafnyplv8dd7bgak89b16wy032z1xl5j";
|
||||
buildDepends = [ deepseq ];
|
||||
meta = {
|
||||
homepage = "https://github.com/trystan/silently";
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "unlambda";
|
||||
version = "0.1";
|
||||
sha256 = "0xmn5w5vza6z2i3fs2hv2jgmb1lyk918viknsx3lk36i1dbyivgi";
|
||||
version = "0.1.2";
|
||||
sha256 = "12x7jc5nwbhkhnylg9l29nr5y8p322avhb9zc0w2apy3fvrq7y93";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ mtl ];
|
||||
|
||||
14
pkgs/development/libraries/haskell/vect/default.nix
Normal file
14
pkgs/development/libraries/haskell/vect/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ cabal, random }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "vect";
|
||||
version = "0.4.7";
|
||||
sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
|
||||
buildDepends = [ random ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~bkomuves/";
|
||||
description = "A low-dimensional linear algebra library, tailored to computer graphics";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -4,14 +4,14 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "vty";
|
||||
version = "4.7.0.14";
|
||||
sha256 = "0wgn2jbr7lih9znkpa09nvb4qjd0801c0r4mwwrw4pd9n9mkjqn9";
|
||||
version = "4.7.0.18";
|
||||
sha256 = "1a414k8fcnjinr01ly49wyk025zacyznw7gclpa83qm0wn0q7bs3";
|
||||
buildDepends = [
|
||||
deepseq mtl parallel parsec terminfo utf8String vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/coreyoconnor/vty";
|
||||
description = "A simple terminal access library";
|
||||
description = "A simple terminal UI library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yesod-auth";
|
||||
version = "1.1.1.2";
|
||||
sha256 = "1agyazzkgwmp63vwx84bzalf9lwg14k5jshj6n97g1iagsiaxqa0";
|
||||
version = "1.1.1.3";
|
||||
sha256 = "0fkrjc2wdv6ils0k7gd3chknw7flb8bbjay3cj355a7kvxnazgyp";
|
||||
buildDepends = [
|
||||
aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
|
||||
liftedBase mimeMail persistent persistentTemplate pureMD5
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ cabal, csv, filepath, HsSyck, HStringTemplate, pandoc, parsec
|
||||
, split, time, utf8String, xhtml
|
||||
{ cabal, csv, filepath, HDBC, HDBCSqlite3, HsSyck, HStringTemplate
|
||||
, pandoc, parsec, split, time, utf8String, xhtml
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yst";
|
||||
version = "0.2.4.1";
|
||||
sha256 = "0y620p6kn1mky30fia63na5idppfjfmc828jcaa0ads08rmj5wgy";
|
||||
version = "0.3";
|
||||
sha256 = "1f09qcf2kqgq9w7irvzlwhv5sy0q3ml82ksza72hj0f5rfbyvfla";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
csv filepath HsSyck HStringTemplate pandoc parsec split time
|
||||
utf8String xhtml
|
||||
csv filepath HDBC HDBCSqlite3 HsSyck HStringTemplate pandoc parsec
|
||||
split time utf8String xhtml
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/jgm/yst";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
|
||||
{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true }:
|
||||
|
||||
assert pythonSupport -> python != null;
|
||||
|
||||
@ -14,7 +14,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}";
|
||||
|
||||
buildInputs = stdenv.lib.optional pythonSupport [ python ];
|
||||
buildInputs = (stdenv.lib.optional pythonSupport [ python ])
|
||||
|
||||
# Libxml2 has an optional dependency on liblzma. However, on impure
|
||||
# platforms, it may end up using that from /usr/lib, and thus lack a
|
||||
# RUNPATH for that, leading to undefined references for its users.
|
||||
++ (stdenv.lib.optional stdenv.isFreeBSD xz);
|
||||
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
|
||||
@ -26,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = http://xmlsoft.org/;
|
||||
description = "A XML parsing library for C";
|
||||
description = "An XML parsing library for C";
|
||||
license = "bsd";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
|
||||
@ -61,6 +61,7 @@ rec {
|
||||
|
||||
setVars = fullDepEntry (''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lXt"
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive"
|
||||
'') ["minInit"];
|
||||
|
||||
doReplaceUsrBin = fullDepEntry (''
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hlint";
|
||||
version = "1.8.31";
|
||||
sha256 = "0d7m7viqf1cawbafiy4nj67hkavlxkv537qypy2vlhr502fispa4";
|
||||
version = "1.8.32";
|
||||
sha256 = "1iiyfkn5y095j4wgfbgck3p4z28zmsj19r08h9darbgb91l4a4rz";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -24,7 +24,7 @@ rec {
|
||||
then attrByPath (tail attrPath) default (getAttr attr e)
|
||||
else default;
|
||||
|
||||
|
||||
|
||||
/* Return nested attribute set in which an attribute is set. For instance
|
||||
["x" "y"] applied with some value v returns `x.y = v;' */
|
||||
setAttrByPath = attrPath: value:
|
||||
@ -37,7 +37,7 @@ rec {
|
||||
getAttrFromPath = attrPath: set:
|
||||
let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'";
|
||||
in attrByPath attrPath (abort errorMsg) set;
|
||||
|
||||
|
||||
|
||||
/* Return the specified attributes from a set.
|
||||
|
||||
@ -79,6 +79,7 @@ rec {
|
||||
filterAttrs = pred: set:
|
||||
listToAttrs (fold (n: ys: let v = getAttr n set; in if pred n v then [(nameValuePair n v)] ++ ys else ys) [] (attrNames set));
|
||||
|
||||
|
||||
/* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list:
|
||||
foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }]
|
||||
=> { a = [ 2 3 ]; }
|
||||
@ -90,6 +91,7 @@ rec {
|
||||
) a (attrNames n)
|
||||
) {} list_of_attrs;
|
||||
|
||||
|
||||
/* Recursively collect sets that verify a given predicate named `pred'
|
||||
from the set `attrs'. The recursion is stopped when the predicate is
|
||||
verified.
|
||||
@ -119,7 +121,7 @@ rec {
|
||||
builtins.listToAttrs. */
|
||||
nameValuePair = name: value: { inherit name value; };
|
||||
|
||||
|
||||
|
||||
/* Apply a function to each element in an attribute set. The
|
||||
function takes two arguments --- the attribute name and its value
|
||||
--- and returns the new value for the attribute. The result is a
|
||||
@ -137,7 +139,7 @@ rec {
|
||||
/* Like `mapAttrs', but allows the name of each attribute to be
|
||||
changed in addition to the value. The applied function should
|
||||
return both the new name and value as a `nameValuePair'.
|
||||
|
||||
|
||||
Example:
|
||||
mapAttrs' (name: value: nameValuePair ("foo_" + name) ("bar-" + value))
|
||||
{ x = "a"; y = "b"; }
|
||||
@ -145,11 +147,11 @@ rec {
|
||||
*/
|
||||
mapAttrs' = f: set:
|
||||
listToAttrs (map (attr: f attr (getAttr attr set)) (attrNames set));
|
||||
|
||||
|
||||
|
||||
/* Call a function for each attribute in the given set and return
|
||||
the result in a list.
|
||||
|
||||
|
||||
Example:
|
||||
mapAttrsToList (name: value: name + value)
|
||||
{ x = "a"; y = "b"; }
|
||||
@ -157,7 +159,7 @@ rec {
|
||||
*/
|
||||
mapAttrsToList = f: attrs:
|
||||
map (name: f name (getAttr name attrs)) (attrNames attrs);
|
||||
|
||||
|
||||
|
||||
/* Like `mapAttrs', except that it recursively applies itself to
|
||||
attribute sets. Also, the first argument of the argument
|
||||
@ -174,7 +176,7 @@ rec {
|
||||
*/
|
||||
mapAttrsRecursive = mapAttrsRecursiveCond (as: true);
|
||||
|
||||
|
||||
|
||||
/* Like `mapAttrsRecursive', but it takes an additional predicate
|
||||
function that tells it whether to recursive into an attribute
|
||||
set. If it returns false, `mapAttrsRecursiveCond' does not
|
||||
@ -258,7 +260,7 @@ rec {
|
||||
|
||||
returns: {
|
||||
foo.bar = 1; # 'foo.*' from the second set
|
||||
foo.quz = 2; #
|
||||
foo.quz = 2; #
|
||||
bar = 3; # 'bar' from the first set
|
||||
baz = 4; # 'baz' from the second set
|
||||
}
|
||||
|
||||
@ -2,13 +2,14 @@
|
||||
# TODO gentoo removes some tools because there are xorg sources (?)
|
||||
|
||||
source $stdenv/setup
|
||||
set -x
|
||||
|
||||
die(){ echo $@; exit 1; }
|
||||
|
||||
|
||||
# custom unpack:
|
||||
cp $src archive
|
||||
sh archive --extract .
|
||||
unzip $src
|
||||
run_file=$(echo amd-driver-installer-*)
|
||||
sh $run_file --extract .
|
||||
|
||||
|
||||
kernelVersion=$(cd ${kernel}/lib/modules && ls)
|
||||
@ -68,7 +69,7 @@ setModVersions(){
|
||||
# On kernels with the fix, use arch_compat_alloc_user_space instead
|
||||
# of compat_alloc_user_space since the latter is GPL-only
|
||||
|
||||
COMPAT_ALLOC_USER_SPACE=compat_alloc_user_space
|
||||
COMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space
|
||||
|
||||
for src_file in \
|
||||
$kernelBuild/arch/x86/include/asm/compat.h \
|
||||
@ -123,6 +124,8 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
|
||||
echo .lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
|
||||
echo 'This is a dummy file created to suppress this warning: could not find /lib/modules/fglrx/build_mod/2.6.x/.libfglrx_ip.a.GCC4.cmd for /lib/modules/fglrx/build_mod/2.6.x/libfglrx_ip.a.GCC4' > lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
|
||||
|
||||
sed -i -e "s@COMPAT_ALLOC_USER_SPACE@$COMPAT_ALLOC_USER_SPACE@" ../kcl_ioctl.c
|
||||
|
||||
make CC=${CC} \
|
||||
LIBIP_PREFIX=$(echo "$LIBIP_PREFIX" | sed -e 's|^\([^/]\)|../\1|') \
|
||||
MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions" \
|
||||
@ -143,12 +146,12 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
|
||||
cp -r common/usr/share $out
|
||||
cp -r common/usr/X11R6 $out
|
||||
|
||||
cp -r arch/$arch/lib $out/lib
|
||||
# cp -r arch/$arch/lib $out/lib
|
||||
|
||||
# what are those files used for?
|
||||
cp -r common/etc $out
|
||||
|
||||
DIR_DEPENDING_ON_XORG_VERSION=x750_64a
|
||||
DIR_DEPENDING_ON_XORG_VERSION=xpic_64a
|
||||
cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg
|
||||
|
||||
t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc
|
||||
@ -164,12 +167,18 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
|
||||
cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri $out/lib
|
||||
cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri/* $out/lib
|
||||
cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so.* $out/lib
|
||||
cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/fglrx/fglrx-libGL.so.1.2 $out/lib/fglrx-libGL.so.1.2
|
||||
|
||||
cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib
|
||||
|
||||
# cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib
|
||||
ln -s libatiuki.so.1.0 $out/lib/libatiuki.so.1
|
||||
ln -s libGL.so.1.2 $out/lib/libGL.so.1
|
||||
ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so.1
|
||||
ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so
|
||||
|
||||
ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1
|
||||
# make xorg use the ati version
|
||||
ln -s $out/lib/xorg/modules/extensions/{fglrx/fglrx-libglx.so,libglx.so}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, mesa # for fgl_glxgears
|
||||
, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
|
||||
, xorg, makeWrapper, glibc, patchelf
|
||||
, unzip
|
||||
}:
|
||||
|
||||
# If you want to use a different Xorg version probably
|
||||
@ -16,6 +17,9 @@
|
||||
|
||||
# http://wiki.cchtml.com/index.php/Main_Page
|
||||
|
||||
# There is one issue left:
|
||||
# /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so
|
||||
|
||||
assert stdenv.system == "x86_64-linux";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -27,14 +31,19 @@ stdenv.mkDerivation rec {
|
||||
inherit libXxf86vm xf86vidmodeproto;
|
||||
|
||||
src = fetchurl {
|
||||
url = https://www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run;
|
||||
sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr";
|
||||
url = http://www2.ati.com/drivers/linux/amd-driver-installer-12-8-x86.x86_64.zip;
|
||||
sha256 = "0hdv89vdap6v0dnwhddizfmlkwyh0j910sp4wyj2lq5pn9rm2lk2";
|
||||
|
||||
# beta
|
||||
# url = "http://www2.ati.com/drivers/beta/amd-driver-installer-12-9-beta-x86.x86_64.zip";
|
||||
# sha256 = "02dmflzfrgr07fa1hv34m7ad8pra21xv7qbk500gqm6v8s9vbplk";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ xlibs.libXext xlibs.libX11
|
||||
xlibs.libXrandr which imake makeWrapper
|
||||
patchelf
|
||||
unzip
|
||||
];
|
||||
|
||||
inherit kernel glibc /* glibc only used for setting interpreter */;
|
||||
|
||||
@ -6,17 +6,16 @@
|
||||
assert stdenv.gcc.libc or null != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "systemd-194";
|
||||
name = "systemd-195";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
|
||||
sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2";
|
||||
sha256 = "00v3haymdxhjk71pqp17irw9pm5ivfvz35ibvw41v5zdhj5il179";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ ./reexec.patch
|
||||
./ignore-duplicates.patch
|
||||
./fix-device-aliases.patch
|
||||
./crypt-devices-are-ready.patch
|
||||
];
|
||||
|
||||
@ -68,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include";
|
||||
|
||||
installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc";
|
||||
installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc sysvinitdir=$(TMPDIR)/etc/init.d";
|
||||
|
||||
# Get rid of configuration-specific data.
|
||||
postInstall =
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/src/core/device.c b/src/core/device.c
|
||||
index 5307341..7bbe99a 100644
|
||||
--- a/src/core/device.c
|
||||
+++ b/src/core/device.c
|
||||
@@ -255,8 +255,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
|
||||
if (!is_path(alias))
|
||||
log_warning("SYSTEMD_ALIAS for %s is not a path, ignoring: %s", sysfs, alias);
|
||||
else {
|
||||
- if ((r = device_add_escaped_name(u, alias)) < 0)
|
||||
- goto fail;
|
||||
+ device_update_unit(m, dev, alias, false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ fetchurl, stdenv, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "asciidoc-8.6.6";
|
||||
name = "asciidoc-8.6.8";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/asciidoc/${name}.tar.gz";
|
||||
sha256 = "9d54c11716e4309ff4d942cf6a6d9745d6a28754ff1de01efed0dc659457ac71";
|
||||
sha256 = "ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
@ -20,11 +20,13 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ python ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.methods.co.nz/asciidoc/";
|
||||
description = "ASCII text-based document generation system";
|
||||
license = "GPLv2+";
|
||||
|
||||
longDescription = ''
|
||||
AsciiDoc is a text-based document generation system. AsciiDoc
|
||||
input files can be translated to HTML and DocBook markups.
|
||||
'';
|
||||
homepage = http://www.methods.co.nz/asciidoc/;
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6951,7 +6951,7 @@ let
|
||||
|
||||
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
|
||||
|
||||
firefoxPkgs = pkgs.firefox15Pkgs;
|
||||
firefoxPkgs = pkgs.firefox16Pkgs;
|
||||
|
||||
firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
|
||||
inherit (gnome) libIDL;
|
||||
@ -6959,12 +6959,6 @@ let
|
||||
|
||||
firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
|
||||
|
||||
firefox12Pkgs = callPackage ../applications/networking/browsers/firefox/12.0.nix {
|
||||
inherit (gnome) libIDL;
|
||||
};
|
||||
|
||||
firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; };
|
||||
|
||||
firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix {
|
||||
inherit (gnome) libIDL;
|
||||
inherit (pythonPackages) pysqlite;
|
||||
|
||||
@ -120,13 +120,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
haskellPlatformArgs_future = self : {
|
||||
inherit (self) cabal ghc;
|
||||
async = self.async_2_0_1_3; # 7.6 ok
|
||||
async = self.async_2_0_1_4; # 7.6 ok
|
||||
cgi = self.cgi_3001_1_8_3; # 7.6 ok
|
||||
fgl = self.fgl_5_4_2_4; # 7.6 ok
|
||||
GLUT = self.GLUT_2_3_0_0; # 7.6 ok
|
||||
haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok
|
||||
html = self.html_1_0_1_2; # 7.6 ok
|
||||
HTTP = self.HTTP_4000_2_5; # 7.6 ok
|
||||
HTTP = self.HTTP_4000_2_6; # 7.6 ok
|
||||
HUnit = self.HUnit_1_2_5_1; # 7.6 ok
|
||||
mtl = self.mtl_2_1_2; # 7.6 ok
|
||||
network = self.network_2_4_0_1; # 7.6 ok
|
||||
@ -155,13 +155,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
haskellPlatformArgs_2012_4_0_0 = self : {
|
||||
inherit (self) cabal ghc;
|
||||
async = self.async_2_0_1_3;
|
||||
async = self.async_2_0_1_4;
|
||||
cgi = self.cgi_3001_1_7_4;
|
||||
fgl = self.fgl_5_4_2_4;
|
||||
GLUT = self.GLUT_2_1_2_1;
|
||||
haskellSrc = self.haskellSrc_1_0_1_5;
|
||||
html = self.html_1_0_1_2;
|
||||
HTTP = self.HTTP_4000_2_5;
|
||||
HTTP = self.HTTP_4000_2_6;
|
||||
HUnit = self.HUnit_1_2_5_1;
|
||||
mtl = self.mtl_2_1_2;
|
||||
network = self.network_2_3_1_0;
|
||||
@ -429,7 +429,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
Agda = callPackage ../development/libraries/haskell/Agda {
|
||||
haskellSrcExts = self.haskellSrcExts_1_11_1;
|
||||
haskeline = self.haskeline_0_6_4_7;
|
||||
};
|
||||
|
||||
accelerate = callPackage ../development/libraries/haskell/accelerate {};
|
||||
@ -462,8 +461,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
AspectAG = callPackage ../development/libraries/haskell/AspectAG {};
|
||||
|
||||
async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {};
|
||||
async = self.async_2_0_1_3;
|
||||
async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {};
|
||||
async = self.async_2_0_1_4;
|
||||
|
||||
attempt = callPackage ../development/libraries/haskell/attempt {};
|
||||
|
||||
@ -724,6 +723,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
editline = callPackage ../development/libraries/haskell/editline {};
|
||||
|
||||
elerea = callPackage ../development/libraries/haskell/elerea {};
|
||||
|
||||
emailValidate = callPackage ../development/libraries/haskell/email-validate {};
|
||||
|
||||
enumerator = callPackage ../development/libraries/haskell/enumerator {};
|
||||
@ -913,8 +914,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {};
|
||||
HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {};
|
||||
HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
|
||||
HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {};
|
||||
HTTP = self.HTTP_4000_2_5;
|
||||
HTTP_4000_2_6 = callPackage ../development/libraries/haskell/HTTP/4000.2.6.nix {};
|
||||
HTTP = self.HTTP_4000_2_6;
|
||||
|
||||
hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
|
||||
|
||||
@ -934,7 +935,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix {};
|
||||
|
||||
HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {};
|
||||
HDBCSqlite3 = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {};
|
||||
|
||||
heist = callPackage ../development/libraries/haskell/heist {};
|
||||
|
||||
@ -952,9 +953,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
hjsmin = callPackage ../development/libraries/haskell/hjsmin {};
|
||||
|
||||
hledger = callPackage ../development/libraries/haskell/hledger {
|
||||
haskeline = self.haskeline_0_6_4_7;
|
||||
};
|
||||
hledger = callPackage ../development/libraries/haskell/hledger {};
|
||||
hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {};
|
||||
hledgerInterest = callPackage ../applications/office/hledger-interest {};
|
||||
hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};
|
||||
@ -1081,6 +1080,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {};
|
||||
|
||||
lambdacubeEngine = callPackage ../development/libraries/haskell/lambdacube-engine {};
|
||||
|
||||
largeword = callPackage ../development/libraries/haskell/largeword {};
|
||||
|
||||
lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};
|
||||
@ -1646,6 +1647,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
Vec = callPackage ../development/libraries/haskell/Vec {};
|
||||
|
||||
vect = callPackage ../development/libraries/haskell/vect {};
|
||||
|
||||
vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix {};
|
||||
vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {};
|
||||
vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {};
|
||||
|
||||
@ -354,7 +354,6 @@ with (import ./release-lib.nix);
|
||||
};
|
||||
|
||||
firefox36Pkgs.firefox = linux;
|
||||
firefox12Pkgs.firefox = linux;
|
||||
firefox15Pkgs.firefox = linux;
|
||||
firefox16Pkgs.firefox = linux;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user