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

Merge changes from branch 'origin/master' into stdenv-updates.

Browse source
This commit is contained in:
Peter Simons 2013-04-20 22:19:39 +02:00
commit 2ffd0b6dac
49 changed files with 995 additions and 568 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/editors/eclipse/default.nix
View file

@ -160,6 +160,22 @@ in {
};
};
eclipse_cpp_42 = buildEclipse {
name = "eclipse-cpp-4.2";
description = "Eclipse IDE for C/C++ Developers";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk-x86_64.tar.gz;
sha256 = "1qq04926pf7v9sf3s0z53zvlbl1j0rmmjmbmhqi49473fnjikh7y";
}
else
fetchurl {
url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk.tar.gz;
sha256 = "1a4s9qlhfpfpdhvffyglnfdr3dq5r2ywcxqywhqi95yhq5nmsgyk";
};
};
eclipse_sdk_42 = buildEclipse {
name = "eclipse-sdk-4.2";
description = "Eclipse Classic";

4
pkgs/applications/misc/gphoto2/default.nix
View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "gphoto2-2.4.14";
name = "gphoto2-2.5.1";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47";
sha256 = "12zn677fvw1bmx70pg0vck2vrvkiy7hx1wzlwf6k23mhdnm4ipad";
};
nativeBuildInputs = [ pkgconfig gettext ];

2
pkgs/applications/misc/gphoto2/gphotofs.nix
View file

@ -5,7 +5,7 @@ let
version = a.lib.attrByPath ["version"] s.version a;
buildInputs = with a; [
libgphoto2 fuse pkgconfig glib
libgphoto2 fuse pkgconfig glib libtool
];
in
rec {

8
pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix
View file

@ -1,6 +1,6 @@
rec {
advertisedUrl="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2";
version = "0.4.0";
url="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2";
hash = "07zxnawkyzy6np9zas6byp9ksjkbi16d11zqrznqarfkf3fkg3yq";
advertisedUrl="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2";
version = "0.5.0";
url="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2";
hash = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
}

2
pkgs/applications/version-management/git-and-tools/default.nix
View file

@ -10,7 +10,7 @@ rec {
git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversionClient hardlink;
cpio tcl tk makeWrapper subversionClient hardlink gzip;
svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries

7
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper, hardlink
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
@ -67,6 +67,11 @@ stdenv.mkDerivation {
sed -i -e 's| perl -ne| ${perl}/bin/perl -ne|g' \
-e 's| perl -e| ${perl}/bin/perl -e|g' \
$out/libexec/git-core/{git-am,git-submodule}
# gzip (and optionally bzip2, xz, zip) are a runtime dependencies for
# gitweb.cgi, need to patch so that it's found
sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
$out/share/gitweb/gitweb.cgi
''
+ (if svnSupport then

10
pkgs/desktops/xfce/default.nix
View file

@ -5,21 +5,13 @@ callPackage = newScope (deps // xfce_self);
deps = rec { # xfce-global dependency overrides should be here
inherit (pkgs.gnome) libglade libwnck vte gtksourceview;
inherit (pkgs.perlPackages) URI;
# The useful bits from ‘gnome-disk-utility’.
libgdu = callPackage ./support/libgdu.nix { };
# Gvfs is required by Thunar for the trash feature and for volume
# mounting. Should use the one from Gnome, but I don't want to mess
# with the Gnome packages (or pull in a zillion Gnome dependencies).
gvfs = callPackage ./support/gvfs.nix { };
};
xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach
#### NixOS support
inherit (deps) gvfs;
inherit (pkgs) gvfs;
xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc";
#### CORE from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"

22
pkgs/desktops/xfce/support/gvfs.nix
View file

@ -1,22 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse
, libxml2, libxslt, docbook_xsl, libgphoto2, libtool }:
stdenv.mkDerivation rec {
name = "gvfs-1.14.2";
src = fetchurl {
url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
};
buildInputs =
[ pkgconfig glib dbus.libs intltool udev libgdu fuse libxml2 libxslt
docbook_xsl libgphoto2 libtool
];
meta = {
description = "Virtual Filesystem support library (for Xfce)";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

144
pkgs/desktops/xfce/support/libgdu-only.patch
View file

@ -1,144 +0,0 @@
diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/configure.ac gnome-disk-utility-2.30.1/configure.ac
--- gnome-disk-utility-2.30.1-orig/configure.ac 2010-03-22 16:54:09.000000000 +0100
+++ gnome-disk-utility-2.30.1/configure.ac 2011-09-06 02:52:09.000000000 +0200
@@ -106,17 +106,6 @@
# GNOME
# *****
-GNOME_COMMON_INIT
-GNOME_DOC_INIT
-GNOME_DEBUG_CHECK
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
-
-AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc],
- [use gtk-doc to build documentation [default=yes]]),,
- enable_gtk_doc=yes)
-GTK_DOC_CHECK([1.3])
-
# ***************************
# Check for required packages
# ***************************
@@ -130,7 +119,6 @@
UNIQUE_REQUIRED=1.0
LIBNOTIFY_REQUIRED=0.3.0
NAUTILUS_REQUIRED=2.24.0
-AVAHI_UI_REQUIRED=0.6.25
UDISKS_REQUIRED=1.0.0
UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0
@@ -144,13 +132,7 @@
PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED])
PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED])
PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= $GTK2_REQUIRED])
-PKG_CHECK_MODULES(UNIQUE, [unique-1.0 >= $UNIQUE_REQUIRED])
-PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED])
PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
-PKG_CHECK_MODULES(X11, [x11])
-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED])
# *************
# Remote Access
@@ -183,21 +165,10 @@
AC_SUBST(GNOME_KEYRING_CFLAGS)
AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"])
-# *************
-# Documentation
-# *************
-
-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-if test x$SCROLLKEEPER_CONFIG = xno; then
- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package)
-fi
-
# ********************
# Internationalization
# ********************
-IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED])
-
GETTEXT_PACKAGE=gnome-disk-utility
AC_SUBST([GETTEXT_PACKAGE])
AM_GLIB_GNU_GETTEXT
diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/doc/Makefile.am gnome-disk-utility-2.30.1/doc/Makefile.am
--- gnome-disk-utility-2.30.1-orig/doc/Makefile.am 2009-12-02 20:52:38.000000000 +0100
+++ gnome-disk-utility-2.30.1/doc/Makefile.am 2011-09-06 02:17:15.000000000 +0200
@@ -70,9 +70,7 @@
Makefile.in \
$(NULL)
-include $(top_srcdir)/gtk-doc.make
-
-CLEANFILES += *~ \
+CLEANFILES = *~ \
gnome-disk-utility-scan* \
gnome-disk-utility.args \
gnome-disk-utility.hierarchy \
@@ -91,4 +89,4 @@
$(NULL)
# Version information for marking the documentation
-EXTRA_DIST += version.xml.in
+EXTRA_DIST = version.xml.in
diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/gtk-doc.make gnome-disk-utility-2.30.1/gtk-doc.make
--- gnome-disk-utility-2.30.1-orig/gtk-doc.make 2010-03-16 00:08:20.000000000 +0100
+++ gnome-disk-utility-2.30.1/gtk-doc.make 2011-09-06 02:15:33.000000000 +0200
@@ -4,15 +4,9 @@
# Everything below here is generic #
####################################
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = $(LIBTOOL) --mode=execute
-else
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN =
-endif
# We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to
@@ -49,22 +43,7 @@
CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-if ENABLE_GTK_DOC
-if GTK_DOC_BUILD_HTML
-HTML_BUILD_STAMP=html-build.stamp
-else
-HTML_BUILD_STAMP=
-endif
-if GTK_DOC_BUILD_PDF
-PDF_BUILD_STAMP=pdf-build.stamp
-else
-PDF_BUILD_STAMP=
-endif
-
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-else
all-local:
-endif
docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/help/Makefile.am gnome-disk-utility-2.30.1/help/Makefile.am
--- gnome-disk-utility-2.30.1-orig/help/Makefile.am 2009-09-23 20:35:01.000000000 +0200
+++ gnome-disk-utility-2.30.1/help/Makefile.am 2011-09-06 02:18:13.000000000 +0200
@@ -1,4 +1,3 @@
-include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook
DOC_MODULE = palimpsest
diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/Makefile.am gnome-disk-utility-2.30.1/Makefile.am
--- gnome-disk-utility-2.30.1-orig/Makefile.am 2010-03-16 00:12:39.000000000 +0100
+++ gnome-disk-utility-2.30.1/Makefile.am 2011-09-06 02:17:34.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = src data doc help po
+SUBDIRS = src data
EXTRA_DIST = \
autogen.sh \

34
pkgs/desktops/xfce/support/libgdu.nix
View file

@ -1,34 +0,0 @@
{ stdenv, fetchurl, gnome, pkgconfig, glib, dbus_glib, intltool, udev, gtk
, libnotify, udisks, libatasmart, avahi
, autoconf, automake, libtool }:
let version = "2.30.1"; in
stdenv.mkDerivation rec {
name = "libgdu-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/2.30/gnome-disk-utility-${version}.tar.bz2";
sha256 = "df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7";
};
# Only build libgdu, not all that Gnome crap.
patches = [ ./libgdu-only.patch ];
buildInputs =
[ pkgconfig glib dbus_glib udisks
autoconf automake libtool
];
preConfigure =
''
substituteInPlace src/gdu/Makefile.am --replace /usr/share/dbus-1/interfaces ${udisks}/share/dbus-1/interfaces
autoreconf -f -i
'';
postConfigure = "cd src/gdu";
meta = {
description = "Xfce/Gvfs support library for mounting filesystems";
};
}

11
pkgs/development/compilers/ghc/wrapper.nix
View file

@ -1,4 +1,4 @@
{ stdenv, ghc, makeWrapper, coreutils }:
{ stdenv, ghc, makeWrapper, coreutils, forUserEnv ? false }:
let
ghc761OrLater = !stdenv.lib.versionOlder ghc.version "7.6.1";
@ -54,4 +54,11 @@ stdenv.mkDerivation ({
inherit ghc;
inherit (ghc) meta;
ghcVersion = ghc.version;
} // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; }))
} // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; })
// (stdenv.lib.optionalAttrs forUserEnv {
postFixup= ''
ln -s $ghc/lib $out/lib;
mkdir -p $out/share/doc
ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghc.version}
'';
}))

38
pkgs/development/libraries/gvfs/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool
, glib, dbus, udev, udisks2, libgcrypt
, libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl
, lightWeight ? true, gnome, samba, makeWrapper }:
stdenv.mkDerivation rec {
name = "gvfs-1.14.2";
src = fetchurl {
url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
};
nativeBuildInputs = [ pkgconfig intltool libtool ];
buildInputs =
[ makeWrapper glib dbus.libs udev udisks2 libgcrypt
libgphoto2 avahi libarchive fuse libcdio
libxml2 libxslt docbook_xsl
# ToDo: a ligther version of libsoup to have FTP/HTTP support?
] ++ stdenv.lib.optionals (!lightWeight) (with gnome; [
gtk libsoup libgnome_keyring gconf samba
# ToDo: not working and probably useless until gnome3 from x-updates
]);
enableParallelBuilding = true;
# ToDo: one probably should specify schemas for samba and others here
fixupPhase = ''
wrapProgram $out/libexec/gvfsd --set GSETTINGS_SCHEMA_DIR "$out/share/glib-2.0/schemas"
'';
meta = {
description = "Virtual Filesystem support library" + stdenv.lib.optionalString lightWeight " (light-weight)";
platforms = stdenv.lib.platforms.linux;
};
}

13
pkgs/development/libraries/haskell/checkers/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ cabal, QuickCheck, random }:
cabal.mkDerivation (self: {
pname = "checkers";
version = "0.3.1";
sha256 = "0lhy8bk8kkj540kjbc76j4x4xsprqwlmxdrss4r0j1bxgmfwha6p";
buildDepends = [ QuickCheck random ];
meta = {
description = "Check properties on standard classes and data structures";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/data-inttrie/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-inttrie";
version = "0.0.8";
sha256 = "0lzp89lq4gb84rcxqi77yarggz94a206da456208rrr7rhlqxg2x";
version = "0.1.0";
sha256 = "00kzf3cw0y0848cprmx3i7g70rmr92hhfzn60a2x98vb8f7y3814";
meta = {
homepage = "http://github.com/luqui/data-inttrie";
description = "A lazy, infinite trie of integers";

5
pkgs/development/libraries/haskell/fclabels/default.nix
View file

@ -2,10 +2,11 @@
cabal.mkDerivation (self: {
pname = "fclabels";
version = "1.1.5";
sha256 = "0g9h1mayzf8v9dg84b54cqjbz9m9hdmj9a2zh0lg2kbc1v7iwlx1";
version = "1.1.6";
sha256 = "0f5zqbqsm89lp1f7wrmcs8pn7hzbbl8id7xa6ny114bgxrfbrwpk";
buildDepends = [ mtl transformers ];
meta = {
homepage = "https://github.com/sebastiaanvisser/fclabels";
description = "First class accessor labels";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

16
pkgs/development/libraries/haskell/pretty-show/1.2.nix Normal file
View file

@ -0,0 +1,16 @@
{ cabal, haskellLexer }:
cabal.mkDerivation (self: {
pname = "pretty-show";
version = "1.2";
sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l";
isLibrary = true;
isExecutable = true;
buildDepends = [ haskellLexer ];
meta = {
homepage = "http://wiki.github.com/yav/pretty-show";
description = "Tools for working with derived Show instances";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

0
pkgs/development/libraries/haskell/pretty-show/default.nix → pkgs/development/libraries/haskell/pretty-show/1.5.nix
View file

7
pkgs/development/libraries/haskell/shakespeare/default.nix
View file

@ -1,4 +1,4 @@
{ cabal, hspec, parsec, text }:
{ cabal, fetchurl, hspec, parsec, text }:
cabal.mkDerivation (self: {
pname = "shakespeare";
@ -6,6 +6,11 @@ cabal.mkDerivation (self: {
sha256 = "0aqcgfx3y9sbp7wvjmx6rxwi4r13qrfxs9a40gc00np03bpk1hxb";
buildDepends = [ parsec text ];
testDepends = [ hspec parsec text ];
patchFlags = "-p2";
patches = [ (fetchurl { url = "https://github.com/yesodweb/shakespeare/pull/102.patch";
sha256 = "02fp87sw7k8zyn8kgmjg8974gi7pp5fyvb4f84i983qycmlmh8xq";
})
];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
description = "A toolkit for making compile-time interpolated templates";

4
pkgs/development/libraries/haskell/socks/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "socks";
version = "0.5.0";
sha256 = "1lk6yvx5a65nz7z89i0sgqzcqw2v6j645nq15kgbpxhcinfdvqs7";
version = "0.5.1";
sha256 = "08zwbkglkahjadqn2m7l0k5yp4lcd9h6kgb8k8mjlwxayx82a0ay";
buildDepends = [ cereal network ];
meta = {
homepage = "http://github.com/vincenthz/hs-socks";

18
pkgs/development/libraries/haskell/wai-handler-launch/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ cabal, blazeBuilder, blazeBuilderConduit, conduit, httpTypes
, transformers, wai, warp, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "wai-handler-launch";
version = "1.3.1.4";
sha256 = "0ii74p2400a4w0pcswk8j57wbasi17alifs4xgwv79b235wnn317";
buildDepends = [
blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai
warp zlibConduit
];
meta = {
description = "Launch a web app in the default browser";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

12
pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
View file

@ -1,13 +1,15 @@
{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2
, zeromq
{ cabal, ansiTerminal, checkers, MonadCatchIOTransformers
, QuickCheck, transformers, zeromq
}:
cabal.mkDerivation (self: {
pname = "zeromq3-haskell";
version = "0.2";
sha256 = "12qljfkcd4l9h3l80jibxgw2an6v782w0sxwvzxqmma29jv6hvky";
version = "0.3.1";
sha256 = "0wr157wl2qpnbfsqy4nlsnd6nbkl063387f7ab4qa07yhj5av80f";
buildDepends = [ MonadCatchIOTransformers transformers ];
testDepends = [
QuickCheck testFramework testFrameworkQuickcheck2
ansiTerminal checkers MonadCatchIOTransformers QuickCheck
transformers
];
extraLibraries = [ zeromq ];
doCheck = false;

12
pkgs/development/libraries/libgphoto2/default.nix
View file

@ -1,18 +1,20 @@
{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }:
stdenv.mkDerivation rec {
name = "libgphoto2-2.4.14";
name = "libgphoto2-2.5.1.1";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr";
sha256 = "057dnyrxr0vy2zs4fhscpig42kvlsy9fg4gj20fhvjcvp3pak8xl";
};
nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ libtool libjpeg ];
buildInputs = [ libtool libjpeg libxml2 ];
# These are mentioned in the Requires line of libgphoto's pkg-config file.
propagatedBuildInputs = [ libusb libexif ];
propagatedBuildInputs = [ libusb1 libexif ];
NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; # bogus detection again
meta = {
homepage = http://www.gphoto.org/proj/libgphoto2/;

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, python, libxml2Python }:
stdenv.mkDerivation rec {
name = "itstool-1.1.1";
name = "itstool-1.2.0";
src = fetchurl {
url = "http://files.itstool.org/itstool/${name}.tar.bz2";
sha256 = "1jchgcgxvqwkhr61q0j08adl1k8hw86dzbl207gzmns9fa7vmzqg";
sha256 = "1akq75aflihm3y7js8biy7b5mw2g11vl8yq90gydnwlwp0zxdzj6";
};
buildInputs = [ python ];

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

@ -231,7 +231,7 @@ in
import ./generic.nix (
rec {
version = "3.0.73";
version = "3.0.74";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -239,7 +239,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1advdnl37jypiv1vyq5b3qapw2vbncm5d7wfc8far9vgvj8hwsqz";
sha256 = "016a16sfvdkjgzwndr985mgqny7cl3rbyz8mrnsh9l55czckiq5x";
};
config = configWithPlatform stdenv.platform;

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

@ -245,7 +245,7 @@ in
import ./generic.nix (
rec {
version = "3.4.40";
version = "3.4.41";
testing = false;
preConfigure = ''
@ -254,7 +254,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "16gsqkzhb362lq51wp1j5k9z9mzwhzfnvfc0h2c6wqnk6rwzms9b";
sha256 = "18zj4biji3vmy7d1gg6lwfpc77856nsfalfpc00vk3pis6yd2k22";
};
config = configWithPlatform stdenv.platform;

56
pkgs/os-specific/linux/plymouth/default.nix Normal file
View file

@ -0,0 +1,56 @@
{ stdenv, fetchurl, cairo, gtk, libdrm, libpng, makeWrapper, pango, pkgconfig }:
stdenv.mkDerivation rec {
name = "plymouth-${version}";
version = "0.8.8";
src = fetchurl {
url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2";
sha256 = "16vm3llgci7h63jaclfskj1ii61d8psq7ny2mncml6m3sghs9b8v";
};
buildInputs = [ cairo gtk libdrm libpng makeWrapper pango pkgconfig ];
configurePhase = ''
export DESTDIR=$out
./configure \
-bindir=$out/bin \
-sbindir=$out/sbin \
--prefix=$out \
--exec-prefix=$out \
--libdir=$out/lib \
--libexecdir=$out/lib \
--enable-tracing \
--sysconfdir=/etc \
--localstatedir=/var \
--without-system-root-install \
--enable-gtk
'';
# --enable-systemd-integration
# -datadir=/share \
# --with-rhgb-compat-link \
preInstall = "mkdir -p $out/bin $out/sbin";
postInstall = ''
cd $out/$out
mv bin/* $out/bin
mv sbin/* $out/sbin
rmdir bin
rmdir sbin
mv * $out/
sed -e "s#> $output##" \
-e "s#> /dev/stderr##" \
-i $out/lib/plymouth/plymouth-populate-initrd
wrapProgram $out/lib/plymouth/plymouth-populate-initrd \
--set PATH $PATH:$out/bin:$out/sbin
'';
meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/Plymouth;
description = "A graphical boot animation";
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
};
}

12
pkgs/os-specific/linux/spl/default.nix
View file

@ -1,18 +1,16 @@
{ stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }:
stdenv.mkDerivation {
name = "spl-0.6.0-rc14-${kernelDev.version}";
name = "spl-0.6.1-${kernelDev.version}";
src = fetchurl {
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz;
sha256 = "00wyamf13z8ins4s14xf0b3hfjfz4w084mr17hs3k5xifb5jxa8g";
url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz";
sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb";
};
patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ];
patches = [ ./install_prefix.patch ];
buildInputs = [ perl kernelDev autoconf automake libtool ];
NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated";
preConfigure = ''
./autogen.sh
@ -20,8 +18,8 @@ stdenv.mkDerivation {
substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
substituteInPlace ./module/spl/spl-module.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
'';
configureFlags = ''

285
pkgs/os-specific/linux/spl/install_prefix.patch
View file

@ -1,19 +1,274 @@
*** spl-0.6.0-rc10/Makefile.am.old Fri Aug 17 14:49:16 2012
--- spl-0.6.0-rc10/Makefile.am Fri Aug 17 14:51:06 2012
diff -rc spl-0.6.1.orig/include/fs/Makefile.am spl-0.6.1/include/fs/Makefile.am
*** spl-0.6.1.orig/include/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/fs/Makefile.am 2013-04-05 22:10:41.436764000 -0700
***************
*** 32,38 ****
*** 8,13 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
install-data-local:
release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \
done
--- 32,38 ----
! kerneldir = /usr/src/spl-$(VERSION)/include/fs
kernel_HEADERS = $(KERNEL_H)
endif
--- 8,13 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
install-data-local:
release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \
! kerneldir = @prefix@/libexec/spl/include/fs
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/linux/Makefile.am spl-0.6.1/include/linux/Makefile.am
*** spl-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/linux/Makefile.am 2013-04-05 22:10:27.789139000 -0700
***************
*** 23,28 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include/linux
kernel_HEADERS = $(KERNEL_H)
endif
--- 23,28 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include/linux
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/Makefile.am spl-0.6.1/include/Makefile.am
*** spl-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/Makefile.am 2013-04-05 22:10:45.108623000 -0700
***************
*** 16,21 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include
kernel_HEADERS = $(KERNEL_H)
endif
--- 16,21 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/rpc/Makefile.am spl-0.6.1/include/rpc/Makefile.am
*** spl-0.6.1.orig/include/rpc/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/rpc/Makefile.am 2013-04-05 22:11:08.724410000 -0700
***************
*** 9,14 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include/rpc
kernel_HEADERS = $(KERNEL_H)
endif
--- 9,14 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include/rpc
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/sharefs/Makefile.am spl-0.6.1/include/sharefs/Makefile.am
*** spl-0.6.1.orig/include/sharefs/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/sharefs/Makefile.am 2013-04-05 22:10:38.852722000 -0700
***************
*** 8,13 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include/sharefs
kernel_HEADERS = $(KERNEL_H)
endif
--- 8,13 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include/sharefs
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/sys/fm/Makefile.am spl-0.6.1/include/sys/fm/Makefile.am
*** spl-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/sys/fm/Makefile.am 2013-04-05 22:10:59.964334000 -0700
***************
*** 9,14 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fm
kernel_HEADERS = $(KERNEL_H)
endif
--- 9,14 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include/sys/fm
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/sys/fs/Makefile.am spl-0.6.1/include/sys/fs/Makefile.am
*** spl-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/sys/fs/Makefile.am 2013-04-05 22:10:57.860366000 -0700
***************
*** 8,13 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fs
kernel_HEADERS = $(KERNEL_H)
endif
--- 8,13 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include/sys/fs
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/sys/Makefile.am spl-0.6.1/include/sys/Makefile.am
*** spl-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/sys/Makefile.am 2013-04-05 22:11:05.788303000 -0700
***************
*** 104,110 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include/sys
kernel_HEADERS = $(KERNEL_H)
endif
--- 104,110 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include/sys
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/sys/sysevent/Makefile.am spl-0.6.1/include/sys/sysevent/Makefile.am
*** spl-0.6.1.orig/include/sys/sysevent/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/sys/sysevent/Makefile.am 2013-04-05 22:10:54.364458000 -0700
***************
*** 8,13 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include/sys/sysevent
kernel_HEADERS = $(KERNEL_H)
endif
--- 8,13 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include/sys/sysevent
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/util/Makefile.am spl-0.6.1/include/util/Makefile.am
*** spl-0.6.1.orig/include/util/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/util/Makefile.am 2013-04-05 22:10:49.452569000 -0700
***************
*** 9,14 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include/util
kernel_HEADERS = $(KERNEL_H)
endif
--- 9,14 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include/util
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/include/vm/Makefile.am spl-0.6.1/include/vm/Makefile.am
*** spl-0.6.1.orig/include/vm/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/include/vm/Makefile.am 2013-04-05 22:10:47.444535000 -0700
***************
*** 10,15 ****
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = /usr/src/spl-$(VERSION)/include/vm
kernel_HEADERS = $(KERNEL_H)
endif
--- 10,15 ----
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL
! kerneldir = @prefix@/libexec/spl/include/vm
kernel_HEADERS = $(KERNEL_H)
endif
diff -rc spl-0.6.1.orig/Makefile.am spl-0.6.1/Makefile.am
*** spl-0.6.1.orig/Makefile.am 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/Makefile.am 2013-04-05 22:09:52.429676000 -0700
***************
*** 9,18 ****
if CONFIG_KERNEL
SUBDIRS += module
! extradir = /usr/src/spl-$(VERSION)
extra_HEADERS = spl.release.in spl_config.h.in
! kerneldir = /usr/src/spl-$(VERSION)/$(LINUX_VERSION)
nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
endif
--- 9,18 ----
if CONFIG_KERNEL
SUBDIRS += module
! extradir = @prefix@/libexec/spl
extra_HEADERS = spl.release.in spl_config.h.in
! kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION)
nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
endif
diff -rc spl-0.6.1.orig/module/Makefile.in spl-0.6.1/module/Makefile.in
*** spl-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:39.000000000 -0700
--- spl-0.6.1/module/Makefile.in 2013-03-28 10:21:59.093481000 -0700
***************
*** 21,41 ****
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
! INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
@# Remove extraneous build products when packaging
! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
if [ -n $$kmoddir ]; then \
find $$kmoddir -name 'modules.*' | xargs $(RM); \
fi
! sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
list='$(subdir-m)'; for subdir in $$list; do \
$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
done
--- 21,41 ----
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
! INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
@# Remove extraneous build products when packaging
! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
if [ -n $$kmoddir ]; then \
find $$kmoddir -name 'modules.*' | xargs $(RM); \
fi
! sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
list='$(subdir-m)'; for subdir in $$list; do \
$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
done

32
pkgs/os-specific/linux/spl/install_prefix_2.patch
View file

@ -1,32 +0,0 @@
*** git-export/include/Makefile.am Tue Mar 6 00:05:28 2012
--- git-export/include/Makefile.am.new Tue Mar 6 00:04:46 2012
***************
*** 16,22 ****
install-data-local:
release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
instfiles=`find . -name '*.h'`; \
for instfile in $$instfiles; do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \
--- 16,22 ----
install-data-local:
release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \
instfiles=`find . -name '*.h'`; \
for instfile in $$instfiles; do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \
***************
*** 24,28 ****
uninstall-local:
release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
$(RM) -R $$instdest
--- 24,28 ----
uninstall-local:
release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \
$(RM) -R $$instdest

33
pkgs/os-specific/linux/spl/module_prefix.patch
View file

@ -1,33 +0,0 @@
*** git-export/module/Makefile.in Wed Dec 31 16:00:01 1969
--- git-export/module/Makefile.in.new Sat Jan 28 21:42:06 2012
***************
*** 17,30 ****
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
! INSTALL_MOD_PATH=$(DESTDIR) \
INSTALL_MOD_DIR=addon/spl $@
@# Remove extraneous build products when packaging
! if [ -n "$(DESTDIR)" ]; then \
! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \
-name 'modules.*' | xargs $(RM); \
fi
! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
--- 17,30 ----
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
! INSTALL_MOD_PATH=@prefix@ \
INSTALL_MOD_DIR=addon/spl $@
@# Remove extraneous build products when packaging
! if [ -n "@prefix@" ]; then \
! find @prefix@/lib/modules/@LINUX_VERSION@ \
-name 'modules.*' | xargs $(RM); \
fi
! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi

0
pkgs/os-specific/linux/udisks/default.nix → pkgs/os-specific/linux/udisks/1-default.nix
View file

42
pkgs/os-specific/linux/udisks/2-default.nix Normal file
View file

@ -0,0 +1,42 @@
{ stdenv, fetchurl, pkgconfig, intltool
, expat, acl, udev, glib, libatasmart, polkit
, libxslt, docbook_xsl, utillinux, mdadm
}:
stdenv.mkDerivation rec {
name = "udisks-2.1.0";
src = fetchurl {
url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii";
};
patches = [ ./force-path.patch ];
# FIXME remove /var/run/current-system/sw/* references
# FIXME add references to parted, cryptsetup, etc (see the sources)
postPatch =
''
substituteInPlace src/main.c --replace \
"@path@" \
"${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
'';
nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ expat acl udev glib libatasmart polkit ]; # in closure anyway
buildInputs = [ libxslt docbook_xsl ];
configureFlags = [
"--localstatedir=/var"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
"--with-udevdir=$(out)/lib/udev"
];
meta = {
homepage = http://www.freedesktop.org/wiki/Software/udisks;
description = "A daemon and command-line utility for querying and manipulating storage devices";
platforms = stdenv.lib.platforms.linux;
};
}

13
pkgs/os-specific/linux/udisks/force-path.patch Normal file
View file

@ -0,0 +1,13 @@
diff -ruN udisks-2.1.0.orig/src/main.c udisks-2.1.0/src/main.c
--- udisks-2.1.0.orig/src/main.c 2013-04-02 10:43:41.629332135 +0000
+++ udisks-2.1.0/src/main.c 2013-04-02 11:04:55.635342823 +0000
@@ -140,8 +140,7 @@
}
}
- if (g_getenv ("PATH") == NULL)
- g_setenv ("PATH", "/usr/bin:/bin:/usr/sbin:/sbin", TRUE);
+ g_setenv ("PATH", "@path@", TRUE);
udisks_notice ("udisks daemon version %s starting", PACKAGE_VERSION);

12
pkgs/os-specific/linux/zfs/default.nix
View file

@ -1,20 +1,19 @@
{ stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
stdenv.mkDerivation {
name = "zfs-0.6.0-rc14-${kernelDev.version}";
name = "zfs-0.6.1-${kernelDev.version}";
src = fetchurl {
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz;
sha256 = "0ny2lbhyfsfwfcasa1iv2hz12hzcskx9mv641955d844dh32z9fg";
url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz;
sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0";
};
patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ];
patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ];
buildInputs = [ kernelDev spl perl autoconf automake libtool zlib libuuid coreutils ];
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
NIX_CFLAGS_LINK = "-lgcc_s";
NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated";
preConfigure = ''
./autogen.sh
@ -31,8 +30,7 @@ stdenv.mkDerivation {
configureFlags = ''
--with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
--with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build
--with-spl=${spl}/libexec/spl/${kernelDev.modDirVersion}
${if stdenv.system == "i686-linux" then "--enable-atomic-spinlocks" else ""}
--with-spl=${spl}/libexec/spl
'';
meta = {

85
pkgs/os-specific/linux/zfs/kerneldir_path.patch
View file

@ -1,85 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 9ffd6be..8e51412 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ distclean-local::
if CONFIG_KERNEL
install-data-local:
release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
- instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
+ instdest=$(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION); \
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \
done
diff --git a/include/Makefile.am b/include/Makefile.am
index 8f9c8d7..5fc44d5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -27,6 +27,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
index 6e481a1..1107809 100644
--- a/include/linux/Makefile.am
+++ b/include/linux/Makefile.am
@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index 651e68b..b80bb55 100644
--- a/include/sys/Makefile.am
+++ b/include/sys/Makefile.am
@@ -89,6 +89,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
index 900ed93..8d9bed2 100644
--- a/include/sys/fm/Makefile.am
+++ b/include/sys/fm/Makefile.am
@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
index d82d076..b4ae3ee 100644
--- a/include/sys/fm/fs/Makefile.am
+++ b/include/sys/fm/fs/Makefile.am
@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
index b702679..3c747f4 100644
--- a/include/sys/fs/Makefile.am
+++ b/include/sys/fs/Makefile.am
@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs
+kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif

70
pkgs/os-specific/linux/zfs/module_perm_prefix.patch
View file

@ -1,70 +0,0 @@
*** git-export/module/Makefile.in.orig Wed Dec 31 16:00:01 1969
--- git-export/module/Makefile.in Tue Mar 6 00:23:07 2012
***************
*** 11,19 ****
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
else \
echo -e "\n" \
"*** Missing spl symbols ensure you have built the spl:\n" \
--- 11,21 ----
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \
! chmod +w @SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
! chmod +w @SPL_SYMBOLS@ .; \
else \
echo -e "\n" \
"*** Missing spl symbols ensure you have built the spl:\n" \
***************
*** 35,55 ****
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
! INSTALL_MOD_PATH=$(DESTDIR) \
INSTALL_MOD_DIR=addon/zfs $@
@# Remove extraneous build products when packaging
! if [ -n "$(DESTDIR)" ]; then \
! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \
-name 'modules.*' | xargs $(RM); \
fi
! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
! $(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs
distdir:
--- 37,57 ----
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
! INSTALL_MOD_PATH=@prefix@ \
INSTALL_MOD_DIR=addon/zfs $@
@# Remove extraneous build products when packaging
! if [ -n "@prefix@" ]; then \
! find @prefix@/lib/modules/@LINUX_VERSION@ \
-name 'modules.*' | xargs $(RM); \
fi
! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
! $(RM) -R @prefix@/lib/modules/@LINUX_VERSION@/addon/zfs
distdir:

214
pkgs/os-specific/linux/zfs/nix-build.patch Normal file
View file

@ -0,0 +1,214 @@
diff -rc zfs-0.6.1.orig/include/linux/Makefile.am zfs-0.6.1/include/linux/Makefile.am
*** zfs-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:47.000000000 -0700
--- zfs-0.6.1/include/linux/Makefile.am 2013-03-28 11:07:10.099129000 -0700
***************
*** 16,21 ****
endif
if CONFIG_KERNEL
! kerneldir = /usr/src/zfs-$(VERSION)/include/linux
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
--- 16,21 ----
endif
if CONFIG_KERNEL
! kerneldir = @prefix@/include/linux
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff -rc zfs-0.6.1.orig/include/Makefile.am zfs-0.6.1/include/Makefile.am
*** zfs-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:47.000000000 -0700
--- zfs-0.6.1/include/Makefile.am 2013-03-28 11:07:38.810870000 -0700
***************
*** 28,33 ****
endif
if CONFIG_KERNEL
! kerneldir = /usr/src/zfs-$(VERSION)/include
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
--- 28,33 ----
endif
if CONFIG_KERNEL
! kerneldir = @prefix@/include
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff -rc zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am zfs-0.6.1/include/sys/fm/fs/Makefile.am
*** zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700
--- zfs-0.6.1/include/sys/fm/fs/Makefile.am 2013-03-28 11:07:36.074756000 -0700
***************
*** 13,18 ****
endif
if CONFIG_KERNEL
! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
--- 13,18 ----
endif
if CONFIG_KERNEL
! kerneldir = @prefix@/include/sys/fm/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff -rc zfs-0.6.1.orig/include/sys/fm/Makefile.am zfs-0.6.1/include/sys/fm/Makefile.am
*** zfs-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:47.000000000 -0700
--- zfs-0.6.1/include/sys/fm/Makefile.am 2013-03-28 11:07:32.265896000 -0700
***************
*** 16,21 ****
endif
if CONFIG_KERNEL
! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
--- 16,21 ----
endif
if CONFIG_KERNEL
! kerneldir = @prefix@/include/sys/fm
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff -rc zfs-0.6.1.orig/include/sys/fs/Makefile.am zfs-0.6.1/include/sys/fs/Makefile.am
*** zfs-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700
--- zfs-0.6.1/include/sys/fs/Makefile.am 2013-03-28 11:07:27.592339000 -0700
***************
*** 13,18 ****
endif
if CONFIG_KERNEL
! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
--- 13,18 ----
endif
if CONFIG_KERNEL
! kerneldir = @prefix@/include/sys/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff -rc zfs-0.6.1.orig/include/sys/Makefile.am zfs-0.6.1/include/sys/Makefile.am
*** zfs-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:47.000000000 -0700
--- zfs-0.6.1/include/sys/Makefile.am 2013-03-28 11:07:19.045717000 -0700
***************
*** 91,96 ****
endif
if CONFIG_KERNEL
! kerneldir = /usr/src/zfs-$(VERSION)/include/sys
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
--- 91,96 ----
endif
if CONFIG_KERNEL
! kerneldir = @prefix@/include/sys
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff -rc zfs-0.6.1.orig/Makefile.am zfs-0.6.1/Makefile.am
*** zfs-0.6.1.orig/Makefile.am 2013-03-26 09:37:47.000000000 -0700
--- zfs-0.6.1/Makefile.am 2013-04-05 23:49:39.763623000 -0700
***************
*** 9,18 ****
if CONFIG_KERNEL
SUBDIRS += module
! extradir = /usr/src/zfs-$(VERSION)
extra_HEADERS = zfs.release.in zfs_config.h.in
! kerneldir = /usr/src/zfs-$(VERSION)/$(LINUX_VERSION)
nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
endif
--- 9,18 ----
if CONFIG_KERNEL
SUBDIRS += module
! extradir = @prefix@/libexec/zfs-$(VERSION)
extra_HEADERS = zfs.release.in zfs_config.h.in
! kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION)
nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
endif
diff -rc zfs-0.6.1.orig/module/Makefile.in zfs-0.6.1/module/Makefile.in
*** zfs-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:47.000000000 -0700
--- zfs-0.6.1/module/Makefile.in 2013-04-05 23:50:41.497876000 -0700
***************
*** 18,26 ****
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
else \
echo -e "\n" \
"*** Missing spl symbols ensure you have built the spl:\n" \
--- 18,26 ----
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
! cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
! cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
else \
echo -e "\n" \
"*** Missing spl symbols ensure you have built the spl:\n" \
***************
*** 28,33 ****
--- 28,35 ----
"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
exit 1; \
fi
+ @# when copying a file out of the nix store, we need to make it writable again.
+ chmod +w @SPL_SYMBOLS@
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
clean:
***************
*** 42,62 ****
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
! INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
@# Remove extraneous build products when packaging
! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
if [ -n $$kmoddir ]; then \
find $$kmoddir -name 'modules.*' | xargs $(RM); \
fi
! sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
list='$(subdir-m)'; for subdir in $$list; do \
$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
done
--- 44,64 ----
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
! INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
@# Remove extraneous build products when packaging
! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
if [ -n $$kmoddir ]; then \
find $$kmoddir -name 'modules.*' | xargs $(RM); \
fi
! sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi
modules_uninstall:
@# Uninstall the kernel modules
! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
list='$(subdir-m)'; for subdir in $$list; do \
$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
done

25
pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch
View file

@ -1,25 +0,0 @@
*** git-export/module/Makefile.in.old Tue Mar 6 01:04:48 2012
--- git-export/module/Makefile.in Tue Mar 6 01:04:59 2012
***************
*** 11,20 ****
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \
chmod +w @SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
chmod +w @SPL_SYMBOLS@ .; \
else \
echo -e "\n" \
--- 11,20 ----
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
! cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \
chmod +w @SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
! cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
chmod +w @SPL_SYMBOLS@ .; \
else \
echo -e "\n" \

14
pkgs/servers/amqp/rabbitmq-server/default.nix
View file

@ -2,10 +2,12 @@
, docbook_xml_dtd_45, docbook_xsl, zip, unzip }:
stdenv.mkDerivation rec {
name = "rabbitmq-server-3.0.3";
name = "rabbitmq-server-${version}";
version = "3.0.3";
src = fetchurl {
url = "http://www.rabbitmq.com/releases/rabbitmq-server/v3.0.3/${name}.tar.gz";
url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz";
sha256 = "07mp57xvszdrlgw8rgn9r9dpa6vdqdjk7f1dyh6a9sdg8s9fby38";
};
@ -20,6 +22,14 @@ stdenv.mkDerivation rec {
installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man";
preInstall =
''
sed -i \
-e 's|SYS_PREFIX=|SYS_PREFIX=''${SYS_PREFIX-''${HOME}/.rabbitmq/${version}}|' \
-e 's|CONF_ENV_FILE=''${SYS_PREFIX}\(.*\)|CONF_ENV_FILE=\1|' \
scripts/rabbitmq-defaults
'';
postInstall =
''
echo 'PATH=${erlang}/bin:${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env

17
pkgs/tools/networking/wicd/default.nix
View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus,
wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, iputils,
locale ? "C" }:
pythonPackages, locale ? "C" }:
# Wicd has a ncurses interface that we do not build because it depends
# on urwid which has not been packaged at this time (2009-12-27).
@ -14,9 +14,16 @@ stdenv.mkDerivation rec {
sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
};
buildInputs = [ python ];
buildInputs = [ python pythonPackages.Babel ];
patches = [ ./no-var-install.patch ./no-trans.patch ./mkdir-networks.patch ./pygtk.patch ./no-optimization.patch ];
patches = [
./no-var-install.patch
./pygtk.patch
./no-optimization.patch
./dhclient.patch
./fix-app-icon.patch
./fix-gtk-issues.patch
];
# Should I be using pygtk's propogated build inputs?
# !!! Should use makeWrapper.
@ -28,13 +35,13 @@ stdenv.mkDerivation rec {
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in
rm po/ast.po
'';
configurePhase = ''
@ -62,7 +69,7 @@ stdenv.mkDerivation rec {
--systemd=$out/lib/systemd/ \
--logrotate=$out/etc/logrotate.d/ \
--desktop=$out/share/applications/ \
--icons=$out/share/icons/hicolour/ \
--icons=$out/share/icons/hicolor/ \
--translations=$out/share/locale/ \
--autostart=$out/etc/xdg/autostart/ \
--varlib=$out/var/lib/ \

101
pkgs/tools/networking/wicd/dhclient.patch Normal file
View file

@ -0,0 +1,101 @@
diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py
--- wicd-1.7.2.4.orig/wicd/wnettools.py 2013-03-30 21:47:19.804907552 +0000
+++ wicd-1.7.2.4/wicd/wnettools.py 2013-03-31 08:44:37.572792110 +0000
@@ -37,6 +37,7 @@
import time
from string import maketrans, translate
+import tempfile
import wpath
import misc
from misc import find_path
@@ -216,6 +217,7 @@
self.flush_tool = None
self.link_detect = None
self.dhcp_object = None
+ self.dhclient_conf_path = None;
def SetDebugMode(self, value):
""" If True, verbose output is enabled. """
@@ -277,12 +279,6 @@
cmd = ""
return (client, cmd)
- # probably /var/lib/wicd/dhclient.conf with defaults
- dhclient_conf_path = os.path.join(
- wpath.varlib,
- 'dhclient.conf'
- )
-
client_dict = {
"dhclient" :
{'connect' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s",
@@ -307,41 +303,44 @@
}
(client_name, cmd) = get_client_name(self.DHCP_CLIENT)
- # cause dhclient doesn't have a handy dandy argument
- # for specifing the hostname to be sent
- if client_name == "dhclient" and flavor:
- if hostname == None:
- # <hostname> will use the system hostname
- # we'll use that if there is hostname passed
- # that shouldn't happen, though
- hostname = '<hostname>'
- print 'attempting to set hostname with dhclient'
- print 'using dhcpcd or another supported client may work better'
- dhclient_template = \
- open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r')
-
- output_conf = open(dhclient_conf_path, 'w')
-
- for line in dhclient_template.readlines():
- line = line.replace('$_HOSTNAME', hostname)
- output_conf.write(line)
-
- output_conf.close()
- dhclient_template.close()
- os.chmod(dhclient_conf_path, 0644)
-
if not client_name or not cmd:
print "WARNING: Failed to find a valid dhcp client!"
return ""
if flavor == "connect":
+ # cause dhclient doesn't have a handy dandy argument
+ # for specifing the hostname to be sent
+ if client_name == "dhclient" and flavor:
+ if hostname == None:
+ # <hostname> will use the system hostname
+ # we'll use that if there is hostname passed
+ # that shouldn't happen, though
+ hostname = '<hostname>'
+ print 'attempting to set hostname with dhclient'
+ print 'using dhcpcd or another supported client may work better'
+ if not self.dhclient_conf_path:
+ _,self.dhclient_conf_path = tempfile.mkstemp()
+ print 'New dhclient conf path: %s ' % self.dhclient_conf_path
+ dhclient_template = \
+ open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r')
+
+ output_conf = open(self.dhclient_conf_path, 'w')
+
+ for line in dhclient_template.readlines():
+ line = line.replace('$_HOSTNAME', hostname)
+ output_conf.write(line)
+
+ output_conf.close()
+ dhclient_template.close()
+ os.chmod(self.dhclient_conf_path, 0644)
+
if not hostname:
hostname = os.uname()[1]
return client_dict[client_name]['connect'] % \
{ "cmd" : cmd,
"iface" : self.iface,
"hostname" : hostname,
- 'dhclientconf' : dhclient_conf_path }
+ 'dhclientconf' : self.dhclient_conf_path }
elif flavor == "release":
return client_dict[client_name]['release'] % {"cmd":cmd, "iface":self.iface}
else:

19
pkgs/tools/networking/wicd/fix-app-icon.patch Normal file
View file

@ -0,0 +1,19 @@
Someone forgot to pack wicd.png icon. We will replace it with existing one.
diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py
--- wicd-1.7.2.4.orig/gtk/gui.py 2013-03-30 21:47:19.802907553 +0000
+++ wicd-1.7.2.4/gtk/gui.py 2013-03-31 08:13:32.876871673 +0000
@@ -205,8 +205,10 @@
self.status_area.hide_all()
- if os.path.exists(os.path.join(wpath.images, "wicd.png")):
- self.window.set_icon_from_file(os.path.join(wpath.images, "wicd.png"))
+ if os.path.exists(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")):
+ self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png"))
+ else:
+ print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png")
self.statusID = None
self.first_dialog_load = True
self.is_visible = True

47
pkgs/tools/networking/wicd/fix-gtk-issues.patch Normal file
View file

@ -0,0 +1,47 @@
diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py
--- wicd-1.7.2.4.orig/gtk/gui.py 2013-03-31 17:01:29.367001288 +0000
+++ wicd-1.7.2.4/gtk/gui.py 2013-03-31 17:55:20.826028396 +0000
@@ -35,7 +35,7 @@
from wicd import misc
from wicd import wpath
from wicd import dbusmanager
-from wicd.misc import noneToString
+from wicd.misc import noneToString, _status_dict
from wicd.translations import _, language
import prefs
from prefs import PreferencesDialog
@@ -250,7 +250,7 @@
def handle_connection_results(self, results):
if results not in ['success', 'aborted'] and self.is_visible:
- error(self.window, language[results], block=False)
+ error(self.window, misc._status_dict[results], block=False)
def create_adhoc_network(self, widget=None):
""" Shows a dialog that creates a new adhoc network. """
diff -ruN wicd-1.7.2.4.orig/po/ru.po wicd-1.7.2.4/po/ru.po
--- wicd-1.7.2.4.orig/po/ru.po 2013-03-31 17:01:29.362001288 +0000
+++ wicd-1.7.2.4/po/ru.po 2013-03-31 17:43:37.909022515 +0000
@@ -173,7 +173,7 @@
#: wicd/misc.py:79
msgid "Connection Failed: Bad password"
-msgstr "Ошибка соединения: Неверный пароль:"
+msgstr "Ошибка соединения: Неверный пароль"
#: wicd/misc.py:89
msgid "Connection Failed: No DHCP offers received."
diff -ruN wicd-1.7.2.4.orig/wicd/misc.py wicd-1.7.2.4/wicd/misc.py
--- wicd-1.7.2.4.orig/wicd/misc.py 2013-03-31 17:01:29.369001288 +0000
+++ wicd-1.7.2.4/wicd/misc.py 2013-03-31 17:23:56.822012593 +0000
@@ -430,7 +430,9 @@
""" Sanitize property names to be used in config-files. """
allowed = string.ascii_letters + '_' + string.digits
table = string.maketrans(allowed, ' ' * len(allowed))
- return s.translate(None, table)
+ #return s.translate(None, table)
+ #return s.translate(table)
+ return s
def sanitize_escaped(s):
""" Sanitize double-escaped unicode strings. """

12
pkgs/tools/networking/wicd/mkdir-networks.patch
View file

@ -1,12 +0,0 @@
wicd normally makes the NETWORKS directory and install the dhclient.conf.template.default at install time,
but we cannot do that, so we make it at runtime instead.
--- wicd-1.7.0/in/scripts=wicd.in 2010-01-14 23:49:11.000000000 -0500
+++ wicd-1.7.0/in/scripts=wicd.in 2010-11-16 22:35:50.272555487 -0500
@@ -1,3 +1,6 @@
#!/bin/bash
+mkdir -p %NETWORKS%
+ln -sf @TEMPLATE-DEFAULT@ %ETC%dhclient.conf.template.default
+
exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@

15
pkgs/tools/networking/wicd/no-trans.patch
View file

@ -1,15 +0,0 @@
--- wicd-1.7.2.4/setup.py 2013-03-14 21:28:21.360580941 +0100
+++ wicd-1.7.2.4/setup.py 2013-03-14 21:22:50.125721943 +0100
@@ -599,12 +599,6 @@
if not wpath.no_install_pmutils:
data.append((wpath.pmutils, ['other/55wicd']))
print 'Using pid path', os.path.basename(wpath.pidfile)
- print 'Language support for',
- for pofile in glob('po/*.po'):
- language = pofile.replace('po/', '').replace('.po', '')
- print language,
- data.append((wpath.translations + language + '/LC_MESSAGES/',
- ['translations/' + language + '/LC_MESSAGES/wicd.mo']))
print
except Exception, e:
print str(e)

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

@ -4007,6 +4007,8 @@ let
gts = callPackage ../development/libraries/gts { };
gvfs = callPackage ../development/libraries/gvfs { };
gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
# TODO : Add MIT Kerberos and let admin choose.
@ -6208,6 +6210,8 @@ let
config = config.pcmciaUtils.config or null;
};
plymouth = callPackage ../os-specific/linux/plymouth { };
pmount = callPackage ../os-specific/linux/pmount { };
pmutils = callPackage ../os-specific/linux/pm-utils { };
@ -6320,7 +6324,9 @@ let
udev145 = callPackage ../os-specific/linux/udev/145.nix { };
udev = pkgs.systemd;
udisks = callPackage ../os-specific/linux/udisks { };
udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
udisks = udisks1;
untie = callPackage ../os-specific/linux/untie { };
@ -7193,7 +7199,7 @@ let
gphoto2 = callPackage ../applications/misc/gphoto2 { };
gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix {
inherit libgphoto2 fuse pkgconfig glib;
inherit libgphoto2 fuse pkgconfig glib libtool;
};
graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };

3
pkgs/top-level/haskell-defaults.nix
View file

@ -53,6 +53,7 @@
cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
prettyShow = self.prettyShow_1_2;
};
ghc703Prefs =
@ -62,6 +63,7 @@
cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; };
monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
prettyShow = self.prettyShow_1_2;
};
ghc702Prefs = ghc701Prefs;
@ -73,6 +75,7 @@
cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; };
monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
prettyShow = self.prettyShow_1_2;
};
ghc6123Prefs = ghc6122Prefs;

18
pkgs/top-level/haskell-packages.nix
View file

@ -89,6 +89,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ghc = ghc; # refers to ghcPlain
};
# The normal GHC wrapper doesn't create links to the documentation in
# ~/.nix-profile. Having this second wrapper allows us to remedy the
# situation without re-building all Haskell packages. At the next
# stdenv-updates merge, this second wrapper will go away.
ghcUserEnvWrapper = pkgs.appendToName "new" (callPackage ../development/compilers/ghc/wrapper.nix {
ghc = ghc; # refers to ghcPlain
forUserEnv = true;
});
# An experimental wrapper around ghcPlain that does not automatically
# pick up packages from the profile, but instead has a fixed set of packages
# in its global database. The set of packages can be specified as an
@ -606,6 +616,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {};
checkers = callPackage ../development/libraries/haskell/checkers {};
citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {};
cipherAes = callPackage ../development/libraries/haskell/cipher-aes {};
@ -1471,7 +1483,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ppm = callPackage ../development/libraries/haskell/ppm {};
prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
prettyShow_1_5 = callPackage ../development/libraries/haskell/pretty-show/1.5.nix {};
prettyShow = self.prettyShow_1_5;
punycode = callPackage ../development/libraries/haskell/punycode {};
@ -1895,6 +1909,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
waiExtra = callPackage ../development/libraries/haskell/wai-extra {};
waiHandlerLaunch = callPackage ../development/libraries/haskell/wai-handler-launch {};
waiLogger = callPackage ../development/libraries/haskell/wai-logger {};
waiTest = callPackage ../development/libraries/haskell/wai-test {};

1
pkgs/top-level/release-python.nix
View file

@ -1806,7 +1806,6 @@ in
gigolo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gtk_xfce_engine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libgdu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libxfce4ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libxfce4util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
libxfcegui4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };