pyrox.dev / nixpkgs
lol
fork atom

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

Peter Simons 2ffd0b6d 2b56b020

options
unified split
Changed files
+995 -568
pkgs
applications
editors
eclipse
default.nix
misc
gphoto2
default.nix
gphotofs.nix
src-info-for-gphotofs.nix
version-management
git-and-tools
default.nix
git
default.nix
desktops
xfce
default.nix
support
gvfs.nix
libgdu-only.patch
libgdu.nix
development
compilers
ghc
wrapper.nix
libraries
gvfs
default.nix
haskell
checkers
default.nix
data-inttrie
default.nix
fclabels
default.nix
pretty-show
1.2.nix
1.5.nix
shakespeare
default.nix
socks
default.nix
wai-handler-launch
default.nix
zeromq3-haskell
default.nix
libgphoto2
default.nix
tools
misc
itstool
default.nix
os-specific
linux
kernel
linux-3.0.nix
linux-3.4.nix
plymouth
default.nix
spl
default.nix
install_prefix.patch
install_prefix_2.patch
module_prefix.patch
udisks
1-default.nix
2-default.nix
force-path.patch
zfs
default.nix
kerneldir_path.patch
module_perm_prefix.patch
nix-build.patch
no_absolute_paths_to_coreutils.patch
servers
amqp
rabbitmq-server
default.nix
tools
networking
wicd
default.nix
dhclient.patch
fix-app-icon.patch
fix-gtk-issues.patch
mkdir-networks.patch
no-trans.patch
top-level
all-packages.nix
haskell-defaults.nix
haskell-packages.nix
release-python.nix
+16
pkgs/applications/editors/eclipse/default.nix
··· 160 160 }; 161 161 }; 162 162 163 + eclipse_cpp_42 = buildEclipse { 164 + name = "eclipse-cpp-4.2"; 165 + description = "Eclipse IDE for C/C++ Developers"; 166 + src = 167 + if stdenv.system == "x86_64-linux" then 168 + fetchurl { 169 + url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk-x86_64.tar.gz; 170 + sha256 = "1qq04926pf7v9sf3s0z53zvlbl1j0rmmjmbmhqi49473fnjikh7y"; 171 + } 172 + else 173 + fetchurl { 174 + url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk.tar.gz; 175 + sha256 = "1a4s9qlhfpfpdhvffyglnfdr3dq5r2ywcxqywhqi95yhq5nmsgyk"; 176 + }; 177 + }; 178 + 163 179 eclipse_sdk_42 = buildEclipse { 164 180 name = "eclipse-sdk-4.2"; 165 181 description = "Eclipse Classic";
+5 -5
pkgs/applications/misc/gphoto2/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { 6 - name = "gphoto2-2.4.14"; 7 - 6 + name = "gphoto2-2.5.1"; 7 + 8 8 src = fetchurl { 9 9 url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; 10 - sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47"; 10 + sha256 = "12zn677fvw1bmx70pg0vck2vrvkiy7hx1wzlwf6k23mhdnm4ipad"; 11 11 }; 12 - 12 + 13 13 nativeBuildInputs = [ pkgconfig gettext ]; 14 14 buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; 15 - 15 + 16 16 meta = { 17 17 description = "a ready to use set of digital camera software applications"; 18 18 longDescription = ''
+5 -5
pkgs/applications/misc/gphoto2/gphotofs.nix
··· 1 - a : 2 - let 1 + a : 2 + let 3 3 fetchurl = a.fetchurl; 4 4 s = import ./src-info-for-gphotofs.nix; 5 5 6 - version = a.lib.attrByPath ["version"] s.version a; 6 + version = a.lib.attrByPath ["version"] s.version a; 7 7 buildInputs = with a; [ 8 - libgphoto2 fuse pkgconfig glib 8 + libgphoto2 fuse pkgconfig glib libtool 9 9 ]; 10 10 in 11 11 rec { ··· 19 19 20 20 /* doConfigure should be removed if not needed */ 21 21 phaseNames = ["doConfigure" "doMakeInstall"]; 22 - 22 + 23 23 name = "gphoto2fs-" + version; 24 24 meta = { 25 25 description = "Fuse FS to mount a digital camera";
+4 -4
pkgs/applications/misc/gphoto2/src-info-for-gphotofs.nix
··· 1 1 rec { 2 - advertisedUrl="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2"; 3 - version = "0.4.0"; 4 - url="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2"; 5 - hash = "07zxnawkyzy6np9zas6byp9ksjkbi16d11zqrznqarfkf3fkg3yq"; 2 + advertisedUrl="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2"; 3 + version = "0.5.0"; 4 + url="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2"; 5 + hash = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7"; 6 6 }
+1 -1
pkgs/applications/version-management/git-and-tools/default.nix
··· 10 10 git = lib.makeOverridable (import ./git) { 11 11 inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep 12 12 asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt 13 - cpio tcl tk makeWrapper subversionClient hardlink; 13 + cpio tcl tk makeWrapper subversionClient hardlink gzip; 14 14 svnSupport = false; # for git-svn support 15 15 guiSupport = false; # requires tcl/tk 16 16 sendEmailSupport = false; # requires plenty of perl libraries
+6 -1
pkgs/applications/version-management/git-and-tools/git/default.nix
··· 1 - { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep 1 + { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip 2 2 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 3 3 , libxslt, tcl, tk, makeWrapper, hardlink 4 4 , svnSupport, subversionClient, perlLibs, smtpPerlLibs ··· 67 67 sed -i -e 's| perl -ne| ${perl}/bin/perl -ne|g' \ 68 68 -e 's| perl -e| ${perl}/bin/perl -e|g' \ 69 69 $out/libexec/git-core/{git-am,git-submodule} 70 + 71 + # gzip (and optionally bzip2, xz, zip) are a runtime dependencies for 72 + # gitweb.cgi, need to patch so that it's found 73 + sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ 74 + $out/share/gitweb/gitweb.cgi 70 75 '' 71 76 72 77 + (if svnSupport then
+1 -9
pkgs/desktops/xfce/default.nix
··· 5 5 deps = rec { # xfce-global dependency overrides should be here 6 6 inherit (pkgs.gnome) libglade libwnck vte gtksourceview; 7 7 inherit (pkgs.perlPackages) URI; 8 - 9 - # The useful bits from ‘gnome-disk-utility’. 10 - libgdu = callPackage ./support/libgdu.nix { }; 11 - 12 - # Gvfs is required by Thunar for the trash feature and for volume 13 - # mounting. Should use the one from Gnome, but I don't want to mess 14 - # with the Gnome packages (or pull in a zillion Gnome dependencies). 15 - gvfs = callPackage ./support/gvfs.nix { }; 16 8 }; 17 9 18 10 xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach 19 11 20 12 #### NixOS support 21 13 22 - inherit (deps) gvfs; 14 + inherit (pkgs) gvfs; 23 15 xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc"; 24 16 25 17 #### CORE from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"
-22
pkgs/desktops/xfce/support/gvfs.nix
··· 1 - { stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse 2 - , libxml2, libxslt, docbook_xsl, libgphoto2, libtool }: 3 - 4 - stdenv.mkDerivation rec { 5 - name = "gvfs-1.14.2"; 6 - 7 - src = fetchurl { 8 - url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; 9 - sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; 10 - }; 11 - 12 - buildInputs = 13 - [ pkgconfig glib dbus.libs intltool udev libgdu fuse libxml2 libxslt 14 - docbook_xsl libgphoto2 libtool 15 - ]; 16 - 17 - meta = { 18 - description = "Virtual Filesystem support library (for Xfce)"; 19 - platforms = stdenv.lib.platforms.linux; 20 - maintainers = [ stdenv.lib.maintainers.eelco ]; 21 - }; 22 - }
-144
pkgs/desktops/xfce/support/libgdu-only.patch
··· 1 - diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/configure.ac gnome-disk-utility-2.30.1/configure.ac 2 - --- gnome-disk-utility-2.30.1-orig/configure.ac 2010-03-22 16:54:09.000000000 +0100 3 - +++ gnome-disk-utility-2.30.1/configure.ac 2011-09-06 02:52:09.000000000 +0200 4 - @@ -106,17 +106,6 @@ 5 - # GNOME 6 - # ***** 7 - 8 - -GNOME_COMMON_INIT 9 - -GNOME_DOC_INIT 10 - -GNOME_DEBUG_CHECK 11 - -GNOME_COMPILE_WARNINGS([maximum]) 12 - -GNOME_MAINTAINER_MODE_DEFINES 13 - - 14 - -AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc], 15 - - [use gtk-doc to build documentation [default=yes]]),, 16 - - enable_gtk_doc=yes) 17 - -GTK_DOC_CHECK([1.3]) 18 - - 19 - # *************************** 20 - # Check for required packages 21 - # *************************** 22 - @@ -130,7 +119,6 @@ 23 - UNIQUE_REQUIRED=1.0 24 - LIBNOTIFY_REQUIRED=0.3.0 25 - NAUTILUS_REQUIRED=2.24.0 26 - -AVAHI_UI_REQUIRED=0.6.25 27 - 28 - UDISKS_REQUIRED=1.0.0 29 - UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0 30 - @@ -144,13 +132,7 @@ 31 - PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED]) 32 - PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED]) 33 - PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) 34 - -PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= $GTK2_REQUIRED]) 35 - -PKG_CHECK_MODULES(UNIQUE, [unique-1.0 >= $UNIQUE_REQUIRED]) 36 - -PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) 37 - PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) 38 - -PKG_CHECK_MODULES(X11, [x11]) 39 - -PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) 40 - -PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED]) 41 - 42 - # ************* 43 - # Remote Access 44 - @@ -183,21 +165,10 @@ 45 - AC_SUBST(GNOME_KEYRING_CFLAGS) 46 - AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"]) 47 - 48 - -# ************* 49 - -# Documentation 50 - -# ************* 51 - - 52 - -AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) 53 - -if test x$SCROLLKEEPER_CONFIG = xno; then 54 - - AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) 55 - -fi 56 - - 57 - # ******************** 58 - # Internationalization 59 - # ******************** 60 - 61 - -IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED]) 62 - - 63 - GETTEXT_PACKAGE=gnome-disk-utility 64 - AC_SUBST([GETTEXT_PACKAGE]) 65 - AM_GLIB_GNU_GETTEXT 66 - diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/doc/Makefile.am gnome-disk-utility-2.30.1/doc/Makefile.am 67 - --- gnome-disk-utility-2.30.1-orig/doc/Makefile.am 2009-12-02 20:52:38.000000000 +0100 68 - +++ gnome-disk-utility-2.30.1/doc/Makefile.am 2011-09-06 02:17:15.000000000 +0200 69 - @@ -70,9 +70,7 @@ 70 - Makefile.in \ 71 - $(NULL) 72 - 73 - -include $(top_srcdir)/gtk-doc.make 74 - - 75 - -CLEANFILES += *~ \ 76 - +CLEANFILES = *~ \ 77 - gnome-disk-utility-scan* \ 78 - gnome-disk-utility.args \ 79 - gnome-disk-utility.hierarchy \ 80 - @@ -91,4 +89,4 @@ 81 - $(NULL) 82 - 83 - # Version information for marking the documentation 84 - -EXTRA_DIST += version.xml.in 85 - +EXTRA_DIST = version.xml.in 86 - diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/gtk-doc.make gnome-disk-utility-2.30.1/gtk-doc.make 87 - --- gnome-disk-utility-2.30.1-orig/gtk-doc.make 2010-03-16 00:08:20.000000000 +0100 88 - +++ gnome-disk-utility-2.30.1/gtk-doc.make 2011-09-06 02:15:33.000000000 +0200 89 - @@ -4,15 +4,9 @@ 90 - # Everything below here is generic # 91 - #################################### 92 - 93 - -if GTK_DOC_USE_LIBTOOL 94 - -GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 95 - -GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) 96 - -GTKDOC_RUN = $(LIBTOOL) --mode=execute 97 - -else 98 - GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 99 - GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) 100 - GTKDOC_RUN = 101 - -endif 102 - 103 - # We set GPATH here; this gives us semantics for GNU make 104 - # which are more like other make's VPATH, when it comes to 105 - @@ -49,22 +43,7 @@ 106 - 107 - CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) 108 - 109 - -if ENABLE_GTK_DOC 110 - -if GTK_DOC_BUILD_HTML 111 - -HTML_BUILD_STAMP=html-build.stamp 112 - -else 113 - -HTML_BUILD_STAMP= 114 - -endif 115 - -if GTK_DOC_BUILD_PDF 116 - -PDF_BUILD_STAMP=pdf-build.stamp 117 - -else 118 - -PDF_BUILD_STAMP= 119 - -endif 120 - - 121 - -all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) 122 - -else 123 - all-local: 124 - -endif 125 - 126 - docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) 127 - 128 - diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/help/Makefile.am gnome-disk-utility-2.30.1/help/Makefile.am 129 - --- gnome-disk-utility-2.30.1-orig/help/Makefile.am 2009-09-23 20:35:01.000000000 +0200 130 - +++ gnome-disk-utility-2.30.1/help/Makefile.am 2011-09-06 02:18:13.000000000 +0200 131 - @@ -1,4 +1,3 @@ 132 - -include $(top_srcdir)/gnome-doc-utils.make 133 - dist-hook: doc-dist-hook 134 - 135 - DOC_MODULE = palimpsest 136 - diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/Makefile.am gnome-disk-utility-2.30.1/Makefile.am 137 - --- gnome-disk-utility-2.30.1-orig/Makefile.am 2010-03-16 00:12:39.000000000 +0100 138 - +++ gnome-disk-utility-2.30.1/Makefile.am 2011-09-06 02:17:34.000000000 +0200 139 - @@ -1,4 +1,4 @@ 140 - -SUBDIRS = src data doc help po 141 - +SUBDIRS = src data 142 - 143 - EXTRA_DIST = \ 144 - autogen.sh \
-34
pkgs/desktops/xfce/support/libgdu.nix
··· 1 - { stdenv, fetchurl, gnome, pkgconfig, glib, dbus_glib, intltool, udev, gtk 2 - , libnotify, udisks, libatasmart, avahi 3 - , autoconf, automake, libtool }: 4 - 5 - let version = "2.30.1"; in 6 - 7 - stdenv.mkDerivation rec { 8 - name = "libgdu-${version}"; 9 - 10 - src = fetchurl { 11 - url = "mirror://gnome/sources/gnome-disk-utility/2.30/gnome-disk-utility-${version}.tar.bz2"; 12 - sha256 = "df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7"; 13 - }; 14 - 15 - # Only build libgdu, not all that Gnome crap. 16 - patches = [ ./libgdu-only.patch ]; 17 - 18 - buildInputs = 19 - [ pkgconfig glib dbus_glib udisks 20 - autoconf automake libtool 21 - ]; 22 - 23 - preConfigure = 24 - '' 25 - substituteInPlace src/gdu/Makefile.am --replace /usr/share/dbus-1/interfaces ${udisks}/share/dbus-1/interfaces 26 - autoreconf -f -i 27 - ''; 28 - 29 - postConfigure = "cd src/gdu"; 30 - 31 - meta = { 32 - description = "Xfce/Gvfs support library for mounting filesystems"; 33 - }; 34 - }
+9 -2
pkgs/development/compilers/ghc/wrapper.nix
··· 1 - { stdenv, ghc, makeWrapper, coreutils }: 1 + { stdenv, ghc, makeWrapper, coreutils, forUserEnv ? false }: 2 2 3 3 let 4 4 ghc761OrLater = !stdenv.lib.versionOlder ghc.version "7.6.1"; ··· 54 54 inherit ghc; 55 55 inherit (ghc) meta; 56 56 ghcVersion = ghc.version; 57 - } // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; })) 57 + } // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; }) 58 + // (stdenv.lib.optionalAttrs forUserEnv { 59 + postFixup= '' 60 + ln -s $ghc/lib $out/lib; 61 + mkdir -p $out/share/doc 62 + ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghc.version} 63 + ''; 64 + }))
+38
pkgs/development/libraries/gvfs/default.nix
··· 1 + { stdenv, fetchurl, pkgconfig, intltool, libtool 2 + , glib, dbus, udev, udisks2, libgcrypt 3 + , libgphoto2, avahi, libarchive, fuse, libcdio 4 + , libxml2, libxslt, docbook_xsl 5 + , lightWeight ? true, gnome, samba, makeWrapper }: 6 + 7 + stdenv.mkDerivation rec { 8 + name = "gvfs-1.14.2"; 9 + 10 + src = fetchurl { 11 + url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; 12 + sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; 13 + }; 14 + 15 + nativeBuildInputs = [ pkgconfig intltool libtool ]; 16 + 17 + buildInputs = 18 + [ makeWrapper glib dbus.libs udev udisks2 libgcrypt 19 + libgphoto2 avahi libarchive fuse libcdio 20 + libxml2 libxslt docbook_xsl 21 + # ToDo: a ligther version of libsoup to have FTP/HTTP support? 22 + ] ++ stdenv.lib.optionals (!lightWeight) (with gnome; [ 23 + gtk libsoup libgnome_keyring gconf samba 24 + # ToDo: not working and probably useless until gnome3 from x-updates 25 + ]); 26 + 27 + enableParallelBuilding = true; 28 + 29 + # ToDo: one probably should specify schemas for samba and others here 30 + fixupPhase = '' 31 + wrapProgram $out/libexec/gvfsd --set GSETTINGS_SCHEMA_DIR "$out/share/glib-2.0/schemas" 32 + ''; 33 + 34 + meta = { 35 + description = "Virtual Filesystem support library" + stdenv.lib.optionalString lightWeight " (light-weight)"; 36 + platforms = stdenv.lib.platforms.linux; 37 + }; 38 + }
+13
pkgs/development/libraries/haskell/checkers/default.nix
··· 1 + { cabal, QuickCheck, random }: 2 + 3 + cabal.mkDerivation (self: { 4 + pname = "checkers"; 5 + version = "0.3.1"; 6 + sha256 = "0lhy8bk8kkj540kjbc76j4x4xsprqwlmxdrss4r0j1bxgmfwha6p"; 7 + buildDepends = [ QuickCheck random ]; 8 + meta = { 9 + description = "Check properties on standard classes and data structures"; 10 + license = self.stdenv.lib.licenses.bsd3; 11 + platforms = self.ghc.meta.platforms; 12 + }; 13 + })
+2 -2
pkgs/development/libraries/haskell/data-inttrie/default.nix
··· 2 2 3 3 cabal.mkDerivation (self: { 4 4 pname = "data-inttrie"; 5 - version = "0.0.8"; 6 - sha256 = "0lzp89lq4gb84rcxqi77yarggz94a206da456208rrr7rhlqxg2x"; 5 + version = "0.1.0"; 6 + sha256 = "00kzf3cw0y0848cprmx3i7g70rmr92hhfzn60a2x98vb8f7y3814"; 7 7 meta = { 8 8 homepage = "http://github.com/luqui/data-inttrie"; 9 9 description = "A lazy, infinite trie of integers";
+3 -2
pkgs/development/libraries/haskell/fclabels/default.nix
··· 2 2 3 3 cabal.mkDerivation (self: { 4 4 pname = "fclabels"; 5 - version = "1.1.5"; 6 - sha256 = "0g9h1mayzf8v9dg84b54cqjbz9m9hdmj9a2zh0lg2kbc1v7iwlx1"; 5 + version = "1.1.6"; 6 + sha256 = "0f5zqbqsm89lp1f7wrmcs8pn7hzbbl8id7xa6ny114bgxrfbrwpk"; 7 7 buildDepends = [ mtl transformers ]; 8 8 meta = { 9 + homepage = "https://github.com/sebastiaanvisser/fclabels"; 9 10 description = "First class accessor labels"; 10 11 license = self.stdenv.lib.licenses.bsd3; 11 12 platforms = self.ghc.meta.platforms;
+16
pkgs/development/libraries/haskell/pretty-show/1.2.nix
··· 1 + { cabal, haskellLexer }: 2 + 3 + cabal.mkDerivation (self: { 4 + pname = "pretty-show"; 5 + version = "1.2"; 6 + sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; 7 + isLibrary = true; 8 + isExecutable = true; 9 + buildDepends = [ haskellLexer ]; 10 + meta = { 11 + homepage = "http://wiki.github.com/yav/pretty-show"; 12 + description = "Tools for working with derived Show instances"; 13 + license = self.stdenv.lib.licenses.bsd3; 14 + platforms = self.ghc.meta.platforms; 15 + }; 16 + })
pkgs/development/libraries/haskell/pretty-show/default.nix pkgs/development/libraries/haskell/pretty-show/1.5.nix
+6 -1
pkgs/development/libraries/haskell/shakespeare/default.nix
··· 1 - { cabal, hspec, parsec, text }: 1 + { cabal, fetchurl, hspec, parsec, text }: 2 2 3 3 cabal.mkDerivation (self: { 4 4 pname = "shakespeare"; ··· 6 6 sha256 = "0aqcgfx3y9sbp7wvjmx6rxwi4r13qrfxs9a40gc00np03bpk1hxb"; 7 7 buildDepends = [ parsec text ]; 8 8 testDepends = [ hspec parsec text ]; 9 + patchFlags = "-p2"; 10 + patches = [ (fetchurl { url = "https://github.com/yesodweb/shakespeare/pull/102.patch"; 11 + sha256 = "02fp87sw7k8zyn8kgmjg8974gi7pp5fyvb4f84i983qycmlmh8xq"; 12 + }) 13 + ]; 9 14 meta = { 10 15 homepage = "http://www.yesodweb.com/book/shakespearean-templates"; 11 16 description = "A toolkit for making compile-time interpolated templates";
+2 -2
pkgs/development/libraries/haskell/socks/default.nix
··· 2 2 3 3 cabal.mkDerivation (self: { 4 4 pname = "socks"; 5 - version = "0.5.0"; 6 - sha256 = "1lk6yvx5a65nz7z89i0sgqzcqw2v6j645nq15kgbpxhcinfdvqs7"; 5 + version = "0.5.1"; 6 + sha256 = "08zwbkglkahjadqn2m7l0k5yp4lcd9h6kgb8k8mjlwxayx82a0ay"; 7 7 buildDepends = [ cereal network ]; 8 8 meta = { 9 9 homepage = "http://github.com/vincenthz/hs-socks";
+18
pkgs/development/libraries/haskell/wai-handler-launch/default.nix
··· 1 + { cabal, blazeBuilder, blazeBuilderConduit, conduit, httpTypes 2 + , transformers, wai, warp, zlibConduit 3 + }: 4 + 5 + cabal.mkDerivation (self: { 6 + pname = "wai-handler-launch"; 7 + version = "1.3.1.4"; 8 + sha256 = "0ii74p2400a4w0pcswk8j57wbasi17alifs4xgwv79b235wnn317"; 9 + buildDepends = [ 10 + blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai 11 + warp zlibConduit 12 + ]; 13 + meta = { 14 + description = "Launch a web app in the default browser"; 15 + license = self.stdenv.lib.licenses.mit; 16 + platforms = self.ghc.meta.platforms; 17 + }; 18 + })
+7 -5
pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
··· 1 - { cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 2 - , zeromq 1 + { cabal, ansiTerminal, checkers, MonadCatchIOTransformers 2 + , QuickCheck, transformers, zeromq 3 3 }: 4 4 5 5 cabal.mkDerivation (self: { 6 6 pname = "zeromq3-haskell"; 7 - version = "0.2"; 8 - sha256 = "12qljfkcd4l9h3l80jibxgw2an6v782w0sxwvzxqmma29jv6hvky"; 7 + version = "0.3.1"; 8 + sha256 = "0wr157wl2qpnbfsqy4nlsnd6nbkl063387f7ab4qa07yhj5av80f"; 9 + buildDepends = [ MonadCatchIOTransformers transformers ]; 9 10 testDepends = [ 10 - QuickCheck testFramework testFrameworkQuickcheck2 11 + ansiTerminal checkers MonadCatchIOTransformers QuickCheck 12 + transformers 11 13 ]; 12 14 extraLibraries = [ zeromq ]; 13 15 doCheck = false;
+10 -8
pkgs/development/libraries/libgphoto2/default.nix
··· 1 - {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: 1 + { stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "libgphoto2-2.4.14"; 4 + name = "libgphoto2-2.5.1.1"; 5 5 6 6 src = fetchurl { 7 7 url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; 8 - sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; 8 + sha256 = "057dnyrxr0vy2zs4fhscpig42kvlsy9fg4gj20fhvjcvp3pak8xl"; 9 9 }; 10 - 10 + 11 11 nativeBuildInputs = [ pkgconfig gettext ]; 12 - buildInputs = [ libtool libjpeg ]; 12 + buildInputs = [ libtool libjpeg libxml2 ]; 13 13 14 14 # These are mentioned in the Requires line of libgphoto's pkg-config file. 15 - propagatedBuildInputs = [ libusb libexif ]; 15 + propagatedBuildInputs = [ libusb1 libexif ]; 16 + 17 + NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; # bogus detection again 16 18 17 19 meta = { 18 20 homepage = http://www.gphoto.org/proj/libgphoto2/; ··· 20 22 longDescription = '' 21 23 This is the library backend for gphoto2. It contains the code for PTP, 22 24 MTP, and other vendor specific protocols for controlling and transferring data 23 - from digital cameras. 25 + from digital cameras. 24 26 ''; 25 27 # XXX: the homepage claims LGPL, but several src files are lgpl21Plus 26 - license = stdenv.lib.licenses.lgpl21Plus; 28 + license = stdenv.lib.licenses.lgpl21Plus; 27 29 platforms = with stdenv.lib.platforms; unix; 28 30 maintainers = with stdenv.lib.maintainers; [ jcumming ]; 29 31 };
+3 -3
pkgs/development/tools/misc/itstool/default.nix
··· 1 1 { stdenv, fetchurl, python, libxml2Python }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "itstool-1.1.1"; 4 + name = "itstool-1.2.0"; 5 5 6 6 src = fetchurl { 7 7 url = "http://files.itstool.org/itstool/${name}.tar.bz2"; 8 - sha256 = "1jchgcgxvqwkhr61q0j08adl1k8hw86dzbl207gzmns9fa7vmzqg"; 8 + sha256 = "1akq75aflihm3y7js8biy7b5mw2g11vl8yq90gydnwlwp0zxdzj6"; 9 9 }; 10 10 11 11 buildInputs = [ python ]; 12 - 12 + 13 13 patchPhase = 14 14 '' 15 15 sed -e '/import libxml2/i import sys\
+2 -2
pkgs/os-specific/linux/kernel/linux-3.0.nix
··· 231 231 import ./generic.nix ( 232 232 233 233 rec { 234 - version = "3.0.73"; 234 + version = "3.0.74"; 235 235 236 236 preConfigure = '' 237 237 substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ··· 239 239 240 240 src = fetchurl { 241 241 url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; 242 - sha256 = "1advdnl37jypiv1vyq5b3qapw2vbncm5d7wfc8far9vgvj8hwsqz"; 242 + sha256 = "016a16sfvdkjgzwndr985mgqny7cl3rbyz8mrnsh9l55czckiq5x"; 243 243 }; 244 244 245 245 config = configWithPlatform stdenv.platform;
+2 -2
pkgs/os-specific/linux/kernel/linux-3.4.nix
··· 245 245 import ./generic.nix ( 246 246 247 247 rec { 248 - version = "3.4.40"; 248 + version = "3.4.41"; 249 249 testing = false; 250 250 251 251 preConfigure = '' ··· 254 254 255 255 src = fetchurl { 256 256 url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; 257 - sha256 = "16gsqkzhb362lq51wp1j5k9z9mzwhzfnvfc0h2c6wqnk6rwzms9b"; 257 + sha256 = "18zj4biji3vmy7d1gg6lwfpc77856nsfalfpc00vk3pis6yd2k22"; 258 258 }; 259 259 260 260 config = configWithPlatform stdenv.platform;
+56
pkgs/os-specific/linux/plymouth/default.nix
··· 1 + { stdenv, fetchurl, cairo, gtk, libdrm, libpng, makeWrapper, pango, pkgconfig }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "plymouth-${version}"; 5 + version = "0.8.8"; 6 + 7 + src = fetchurl { 8 + url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2"; 9 + sha256 = "16vm3llgci7h63jaclfskj1ii61d8psq7ny2mncml6m3sghs9b8v"; 10 + }; 11 + 12 + buildInputs = [ cairo gtk libdrm libpng makeWrapper pango pkgconfig ]; 13 + 14 + configurePhase = '' 15 + export DESTDIR=$out 16 + ./configure \ 17 + -bindir=$out/bin \ 18 + -sbindir=$out/sbin \ 19 + --prefix=$out \ 20 + --exec-prefix=$out \ 21 + --libdir=$out/lib \ 22 + --libexecdir=$out/lib \ 23 + --enable-tracing \ 24 + --sysconfdir=/etc \ 25 + --localstatedir=/var \ 26 + --without-system-root-install \ 27 + --enable-gtk 28 + ''; 29 + # --enable-systemd-integration 30 + # -datadir=/share \ 31 + # --with-rhgb-compat-link \ 32 + 33 + preInstall = "mkdir -p $out/bin $out/sbin"; 34 + 35 + postInstall = '' 36 + cd $out/$out 37 + mv bin/* $out/bin 38 + mv sbin/* $out/sbin 39 + 40 + rmdir bin 41 + rmdir sbin 42 + mv * $out/ 43 + sed -e "s#> $output##" \ 44 + -e "s#> /dev/stderr##" \ 45 + -i $out/lib/plymouth/plymouth-populate-initrd 46 + wrapProgram $out/lib/plymouth/plymouth-populate-initrd \ 47 + --set PATH $PATH:$out/bin:$out/sbin 48 + ''; 49 + 50 + meta = with stdenv.lib; { 51 + homepage = http://www.freedesktop.org/wiki/Software/Plymouth; 52 + description = "A graphical boot animation"; 53 + license = licenses.gpl2; 54 + maintainers = [ maintainers.goibhniu ]; 55 + }; 56 + }
+7 -9
pkgs/os-specific/linux/spl/default.nix
··· 1 1 { stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "spl-0.6.0-rc14-${kernelDev.version}"; 4 + name = "spl-0.6.1-${kernelDev.version}"; 5 5 src = fetchurl { 6 - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz; 7 - sha256 = "00wyamf13z8ins4s14xf0b3hfjfz4w084mr17hs3k5xifb5jxa8g"; 6 + url = "http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz"; 7 + sha256 = "1bnianc00bkpdbcmignzqfv9yr8h6vj56wfl7lkhi9a5m5b3xakb"; 8 8 }; 9 9 10 - patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; 10 + patches = [ ./install_prefix.patch ]; 11 11 12 12 buildInputs = [ perl kernelDev autoconf automake libtool ]; 13 13 14 - NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated"; 15 - 16 14 preConfigure = '' 17 15 ./autogen.sh 18 16 19 - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid 20 - substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod 17 + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid 18 + substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod 21 19 22 20 substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" 23 - substituteInPlace ./module/spl/spl-module.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" 24 21 substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" 22 + substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" 25 23 ''; 26 24 27 25 configureFlags = ''
+270 -15
pkgs/os-specific/linux/spl/install_prefix.patch
··· 1 - *** spl-0.6.0-rc10/Makefile.am.old Fri Aug 17 14:49:16 2012 2 - --- spl-0.6.0-rc10/Makefile.am Fri Aug 17 14:51:06 2012 1 + diff -rc spl-0.6.1.orig/include/fs/Makefile.am spl-0.6.1/include/fs/Makefile.am 2 + *** spl-0.6.1.orig/include/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 3 + --- spl-0.6.1/include/fs/Makefile.am 2013-04-05 22:10:41.436764000 -0700 4 + *************** 5 + *** 8,13 **** 6 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 7 + 8 + if CONFIG_KERNEL 9 + ! kerneldir = /usr/src/spl-$(VERSION)/include/fs 10 + kernel_HEADERS = $(KERNEL_H) 11 + endif 12 + --- 8,13 ---- 13 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 14 + 15 + if CONFIG_KERNEL 16 + ! kerneldir = @prefix@/libexec/spl/include/fs 17 + kernel_HEADERS = $(KERNEL_H) 18 + endif 19 + diff -rc spl-0.6.1.orig/include/linux/Makefile.am spl-0.6.1/include/linux/Makefile.am 20 + *** spl-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:39.000000000 -0700 21 + --- spl-0.6.1/include/linux/Makefile.am 2013-04-05 22:10:27.789139000 -0700 22 + *************** 23 + *** 23,28 **** 24 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 25 + 26 + if CONFIG_KERNEL 27 + ! kerneldir = /usr/src/spl-$(VERSION)/include/linux 28 + kernel_HEADERS = $(KERNEL_H) 29 + endif 30 + --- 23,28 ---- 31 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 32 + 33 + if CONFIG_KERNEL 34 + ! kerneldir = @prefix@/libexec/spl/include/linux 35 + kernel_HEADERS = $(KERNEL_H) 36 + endif 37 + diff -rc spl-0.6.1.orig/include/Makefile.am spl-0.6.1/include/Makefile.am 38 + *** spl-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:39.000000000 -0700 39 + --- spl-0.6.1/include/Makefile.am 2013-04-05 22:10:45.108623000 -0700 40 + *************** 41 + *** 16,21 **** 42 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 43 + 44 + if CONFIG_KERNEL 45 + ! kerneldir = /usr/src/spl-$(VERSION)/include 46 + kernel_HEADERS = $(KERNEL_H) 47 + endif 48 + --- 16,21 ---- 49 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 50 + 51 + if CONFIG_KERNEL 52 + ! kerneldir = @prefix@/libexec/spl/include 53 + kernel_HEADERS = $(KERNEL_H) 54 + endif 55 + diff -rc spl-0.6.1.orig/include/rpc/Makefile.am spl-0.6.1/include/rpc/Makefile.am 56 + *** spl-0.6.1.orig/include/rpc/Makefile.am 2013-03-26 09:37:39.000000000 -0700 57 + --- spl-0.6.1/include/rpc/Makefile.am 2013-04-05 22:11:08.724410000 -0700 58 + *************** 59 + *** 9,14 **** 60 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 61 + 62 + if CONFIG_KERNEL 63 + ! kerneldir = /usr/src/spl-$(VERSION)/include/rpc 64 + kernel_HEADERS = $(KERNEL_H) 65 + endif 66 + --- 9,14 ---- 67 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 68 + 69 + if CONFIG_KERNEL 70 + ! kerneldir = @prefix@/libexec/spl/include/rpc 71 + kernel_HEADERS = $(KERNEL_H) 72 + endif 73 + diff -rc spl-0.6.1.orig/include/sharefs/Makefile.am spl-0.6.1/include/sharefs/Makefile.am 74 + *** spl-0.6.1.orig/include/sharefs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 75 + --- spl-0.6.1/include/sharefs/Makefile.am 2013-04-05 22:10:38.852722000 -0700 76 + *************** 77 + *** 8,13 **** 78 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 79 + 80 + if CONFIG_KERNEL 81 + ! kerneldir = /usr/src/spl-$(VERSION)/include/sharefs 82 + kernel_HEADERS = $(KERNEL_H) 83 + endif 84 + --- 8,13 ---- 85 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 86 + 87 + if CONFIG_KERNEL 88 + ! kerneldir = @prefix@/libexec/spl/include/sharefs 89 + kernel_HEADERS = $(KERNEL_H) 90 + endif 91 + diff -rc spl-0.6.1.orig/include/sys/fm/Makefile.am spl-0.6.1/include/sys/fm/Makefile.am 92 + *** spl-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:39.000000000 -0700 93 + --- spl-0.6.1/include/sys/fm/Makefile.am 2013-04-05 22:10:59.964334000 -0700 94 + *************** 95 + *** 9,14 **** 96 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 97 + 98 + if CONFIG_KERNEL 99 + ! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fm 100 + kernel_HEADERS = $(KERNEL_H) 101 + endif 102 + --- 9,14 ---- 103 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 104 + 105 + if CONFIG_KERNEL 106 + ! kerneldir = @prefix@/libexec/spl/include/sys/fm 107 + kernel_HEADERS = $(KERNEL_H) 108 + endif 109 + diff -rc spl-0.6.1.orig/include/sys/fs/Makefile.am spl-0.6.1/include/sys/fs/Makefile.am 110 + *** spl-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:39.000000000 -0700 111 + --- spl-0.6.1/include/sys/fs/Makefile.am 2013-04-05 22:10:57.860366000 -0700 112 + *************** 113 + *** 8,13 **** 114 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 115 + 116 + if CONFIG_KERNEL 117 + ! kerneldir = /usr/src/spl-$(VERSION)/include/sys/fs 118 + kernel_HEADERS = $(KERNEL_H) 119 + endif 120 + --- 8,13 ---- 121 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 122 + 123 + if CONFIG_KERNEL 124 + ! kerneldir = @prefix@/libexec/spl/include/sys/fs 125 + kernel_HEADERS = $(KERNEL_H) 126 + endif 127 + diff -rc spl-0.6.1.orig/include/sys/Makefile.am spl-0.6.1/include/sys/Makefile.am 128 + *** spl-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:39.000000000 -0700 129 + --- spl-0.6.1/include/sys/Makefile.am 2013-04-05 22:11:05.788303000 -0700 130 + *************** 131 + *** 104,110 **** 132 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 133 + 134 + if CONFIG_KERNEL 135 + ! kerneldir = /usr/src/spl-$(VERSION)/include/sys 136 + kernel_HEADERS = $(KERNEL_H) 137 + endif 138 + 139 + --- 104,110 ---- 140 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 141 + 142 + if CONFIG_KERNEL 143 + ! kerneldir = @prefix@/libexec/spl/include/sys 144 + kernel_HEADERS = $(KERNEL_H) 145 + endif 146 + 147 + diff -rc spl-0.6.1.orig/include/sys/sysevent/Makefile.am spl-0.6.1/include/sys/sysevent/Makefile.am 148 + *** spl-0.6.1.orig/include/sys/sysevent/Makefile.am 2013-03-26 09:37:39.000000000 -0700 149 + --- spl-0.6.1/include/sys/sysevent/Makefile.am 2013-04-05 22:10:54.364458000 -0700 150 + *************** 151 + *** 8,13 **** 152 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 153 + 154 + if CONFIG_KERNEL 155 + ! kerneldir = /usr/src/spl-$(VERSION)/include/sys/sysevent 156 + kernel_HEADERS = $(KERNEL_H) 157 + endif 158 + --- 8,13 ---- 159 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 160 + 161 + if CONFIG_KERNEL 162 + ! kerneldir = @prefix@/libexec/spl/include/sys/sysevent 163 + kernel_HEADERS = $(KERNEL_H) 164 + endif 165 + diff -rc spl-0.6.1.orig/include/util/Makefile.am spl-0.6.1/include/util/Makefile.am 166 + *** spl-0.6.1.orig/include/util/Makefile.am 2013-03-26 09:37:39.000000000 -0700 167 + --- spl-0.6.1/include/util/Makefile.am 2013-04-05 22:10:49.452569000 -0700 168 + *************** 169 + *** 9,14 **** 170 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 171 + 172 + if CONFIG_KERNEL 173 + ! kerneldir = /usr/src/spl-$(VERSION)/include/util 174 + kernel_HEADERS = $(KERNEL_H) 175 + endif 176 + --- 9,14 ---- 177 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 178 + 179 + if CONFIG_KERNEL 180 + ! kerneldir = @prefix@/libexec/spl/include/util 181 + kernel_HEADERS = $(KERNEL_H) 182 + endif 183 + diff -rc spl-0.6.1.orig/include/vm/Makefile.am spl-0.6.1/include/vm/Makefile.am 184 + *** spl-0.6.1.orig/include/vm/Makefile.am 2013-03-26 09:37:39.000000000 -0700 185 + --- spl-0.6.1/include/vm/Makefile.am 2013-04-05 22:10:47.444535000 -0700 3 186 *************** 4 - *** 32,38 **** 187 + *** 10,15 **** 188 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 189 + 5 190 if CONFIG_KERNEL 6 - install-data-local: 7 - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ 8 - ! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ 9 - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ 10 - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ 11 - done 12 - --- 32,38 ---- 191 + ! kerneldir = /usr/src/spl-$(VERSION)/include/vm 192 + kernel_HEADERS = $(KERNEL_H) 193 + endif 194 + --- 10,15 ---- 195 + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) 196 + 13 197 if CONFIG_KERNEL 14 - install-data-local: 15 - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ 16 - ! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ 17 - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ 18 - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ 198 + ! kerneldir = @prefix@/libexec/spl/include/vm 199 + kernel_HEADERS = $(KERNEL_H) 200 + endif 201 + diff -rc spl-0.6.1.orig/Makefile.am spl-0.6.1/Makefile.am 202 + *** spl-0.6.1.orig/Makefile.am 2013-03-26 09:37:39.000000000 -0700 203 + --- spl-0.6.1/Makefile.am 2013-04-05 22:09:52.429676000 -0700 204 + *************** 205 + *** 9,18 **** 206 + if CONFIG_KERNEL 207 + SUBDIRS += module 208 + 209 + ! extradir = /usr/src/spl-$(VERSION) 210 + extra_HEADERS = spl.release.in spl_config.h.in 211 + 212 + ! kerneldir = /usr/src/spl-$(VERSION)/$(LINUX_VERSION) 213 + nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) 214 + endif 215 + 216 + --- 9,18 ---- 217 + if CONFIG_KERNEL 218 + SUBDIRS += module 219 + 220 + ! extradir = @prefix@/libexec/spl 221 + extra_HEADERS = spl.release.in spl_config.h.in 222 + 223 + ! kerneldir = @prefix@/libexec/spl/$(LINUX_VERSION) 224 + nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) 225 + endif 226 + 227 + diff -rc spl-0.6.1.orig/module/Makefile.in spl-0.6.1/module/Makefile.in 228 + *** spl-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:39.000000000 -0700 229 + --- spl-0.6.1/module/Makefile.in 2013-03-28 10:21:59.093481000 -0700 230 + *************** 231 + *** 21,41 **** 232 + modules_install: 233 + @# Install the kernel modules 234 + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ 235 + ! INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ 236 + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) 237 + @# Remove extraneous build products when packaging 238 + ! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ 239 + if [ -n $$kmoddir ]; then \ 240 + find $$kmoddir -name 'modules.*' | xargs $(RM); \ 241 + fi 242 + ! sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ 243 + if [ -f $$sysmap ]; then \ 244 + depmod -ae -F $$sysmap @LINUX_VERSION@; \ 245 + fi 246 + 247 + modules_uninstall: 248 + @# Uninstall the kernel modules 249 + ! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ 250 + list='$(subdir-m)'; for subdir in $$list; do \ 251 + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ 252 + done 253 + --- 21,41 ---- 254 + modules_install: 255 + @# Install the kernel modules 256 + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ 257 + ! INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ 258 + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) 259 + @# Remove extraneous build products when packaging 260 + ! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ 261 + if [ -n $$kmoddir ]; then \ 262 + find $$kmoddir -name 'modules.*' | xargs $(RM); \ 263 + fi 264 + ! sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ 265 + if [ -f $$sysmap ]; then \ 266 + depmod -ae -F $$sysmap @LINUX_VERSION@; \ 267 + fi 268 + 269 + modules_uninstall: 270 + @# Uninstall the kernel modules 271 + ! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ 272 + list='$(subdir-m)'; for subdir in $$list; do \ 273 + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ 19 274 done
-32
pkgs/os-specific/linux/spl/install_prefix_2.patch
··· 1 - *** git-export/include/Makefile.am Tue Mar 6 00:05:28 2012 2 - --- git-export/include/Makefile.am.new Tue Mar 6 00:04:46 2012 3 - *************** 4 - *** 16,22 **** 5 - 6 - install-data-local: 7 - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ 8 - ! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ 9 - instfiles=`find . -name '*.h'`; \ 10 - for instfile in $$instfiles; do \ 11 - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ 12 - --- 16,22 ---- 13 - 14 - install-data-local: 15 - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ 16 - ! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ 17 - instfiles=`find . -name '*.h'`; \ 18 - for instfile in $$instfiles; do \ 19 - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ 20 - *************** 21 - *** 24,28 **** 22 - 23 - uninstall-local: 24 - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ 25 - ! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ 26 - $(RM) -R $$instdest 27 - --- 24,28 ---- 28 - 29 - uninstall-local: 30 - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ 31 - ! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ 32 - $(RM) -R $$instdest
-33
pkgs/os-specific/linux/spl/module_prefix.patch
··· 1 - *** git-export/module/Makefile.in Wed Dec 31 16:00:01 1969 2 - --- git-export/module/Makefile.in.new Sat Jan 28 21:42:06 2012 3 - *************** 4 - *** 17,30 **** 5 - modules_install: 6 - @# Install the kernel modules 7 - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ 8 - ! INSTALL_MOD_PATH=$(DESTDIR) \ 9 - INSTALL_MOD_DIR=addon/spl $@ 10 - @# Remove extraneous build products when packaging 11 - ! if [ -n "$(DESTDIR)" ]; then \ 12 - ! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ 13 - -name 'modules.*' | xargs $(RM); \ 14 - fi 15 - ! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ 16 - if [ -f $$sysmap ]; then \ 17 - depmod -ae -F $$sysmap @LINUX_VERSION@; \ 18 - fi 19 - --- 17,30 ---- 20 - modules_install: 21 - @# Install the kernel modules 22 - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ 23 - ! INSTALL_MOD_PATH=@prefix@ \ 24 - INSTALL_MOD_DIR=addon/spl $@ 25 - @# Remove extraneous build products when packaging 26 - ! if [ -n "@prefix@" ]; then \ 27 - ! find @prefix@/lib/modules/@LINUX_VERSION@ \ 28 - -name 'modules.*' | xargs $(RM); \ 29 - fi 30 - ! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ 31 - if [ -f $$sysmap ]; then \ 32 - depmod -ae -F $$sysmap @LINUX_VERSION@; \ 33 - fi
+42
pkgs/os-specific/linux/udisks/2-default.nix
··· 1 + { stdenv, fetchurl, pkgconfig, intltool 2 + , expat, acl, udev, glib, libatasmart, polkit 3 + , libxslt, docbook_xsl, utillinux, mdadm 4 + }: 5 + 6 + stdenv.mkDerivation rec { 7 + name = "udisks-2.1.0"; 8 + 9 + src = fetchurl { 10 + url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2"; 11 + sha256 = "1a0mipihilscv9jwy59xrqn2kkri9p12a09anpjdld83l7jhh0ii"; 12 + }; 13 + 14 + patches = [ ./force-path.patch ]; 15 + 16 + # FIXME remove /var/run/current-system/sw/* references 17 + # FIXME add references to parted, cryptsetup, etc (see the sources) 18 + postPatch = 19 + '' 20 + substituteInPlace src/main.c --replace \ 21 + "@path@" \ 22 + "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" 23 + ''; 24 + 25 + nativeBuildInputs = [ pkgconfig intltool ]; 26 + 27 + propagatedBuildInputs = [ expat acl udev glib libatasmart polkit ]; # in closure anyway 28 + 29 + buildInputs = [ libxslt docbook_xsl ]; 30 + 31 + configureFlags = [ 32 + "--localstatedir=/var" 33 + "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" 34 + "--with-udevdir=$(out)/lib/udev" 35 + ]; 36 + 37 + meta = { 38 + homepage = http://www.freedesktop.org/wiki/Software/udisks; 39 + description = "A daemon and command-line utility for querying and manipulating storage devices"; 40 + platforms = stdenv.lib.platforms.linux; 41 + }; 42 + }
pkgs/os-specific/linux/udisks/default.nix pkgs/os-specific/linux/udisks/1-default.nix
+13
pkgs/os-specific/linux/udisks/force-path.patch
··· 1 + diff -ruN udisks-2.1.0.orig/src/main.c udisks-2.1.0/src/main.c 2 + --- udisks-2.1.0.orig/src/main.c 2013-04-02 10:43:41.629332135 +0000 3 + +++ udisks-2.1.0/src/main.c 2013-04-02 11:04:55.635342823 +0000 4 + @@ -140,8 +140,7 @@ 5 + } 6 + } 7 + 8 + - if (g_getenv ("PATH") == NULL) 9 + - g_setenv ("PATH", "/usr/bin:/bin:/usr/sbin:/sbin", TRUE); 10 + + g_setenv ("PATH", "@path@", TRUE); 11 + 12 + udisks_notice ("udisks daemon version %s starting", PACKAGE_VERSION); 13 +
+5 -7
pkgs/os-specific/linux/zfs/default.nix
··· 1 1 { stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "zfs-0.6.0-rc14-${kernelDev.version}"; 4 + name = "zfs-0.6.1-${kernelDev.version}"; 5 5 6 6 src = fetchurl { 7 - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz; 8 - sha256 = "0ny2lbhyfsfwfcasa1iv2hz12hzcskx9mv641955d844dh32z9fg"; 7 + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz; 8 + sha256 = "1ykph9d4p70mam6lvcx0zld6d34gch15dsilds5ncbxh0m52knl0"; 9 9 }; 10 10 11 - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; 11 + patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; 12 12 13 13 buildInputs = [ kernelDev spl perl autoconf automake libtool zlib libuuid coreutils ]; 14 14 15 15 # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work 16 16 NIX_CFLAGS_LINK = "-lgcc_s"; 17 - NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated"; 18 17 19 18 preConfigure = '' 20 19 ./autogen.sh ··· 31 30 configureFlags = '' 32 31 --with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build 33 32 --with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build 34 - --with-spl=${spl}/libexec/spl/${kernelDev.modDirVersion} 35 - ${if stdenv.system == "i686-linux" then "--enable-atomic-spinlocks" else ""} 33 + --with-spl=${spl}/libexec/spl 36 34 ''; 37 35 38 36 meta = {
-85
pkgs/os-specific/linux/zfs/kerneldir_path.patch
··· 1 - diff --git a/Makefile.am b/Makefile.am 2 - index 9ffd6be..8e51412 100644 3 - --- a/Makefile.am 4 - +++ b/Makefile.am 5 - @@ -34,7 +34,7 @@ distclean-local:: 6 - if CONFIG_KERNEL 7 - install-data-local: 8 - release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ 9 - - instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ 10 - + instdest=$(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION); \ 11 - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ 12 - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ 13 - done 14 - diff --git a/include/Makefile.am b/include/Makefile.am 15 - index 8f9c8d7..5fc44d5 100644 16 - --- a/include/Makefile.am 17 - +++ b/include/Makefile.am 18 - @@ -27,6 +27,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) 19 - endif 20 - 21 - if CONFIG_KERNEL 22 - -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) 23 - +kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) 24 - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 25 - endif 26 - diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am 27 - index 6e481a1..1107809 100644 28 - --- a/include/linux/Makefile.am 29 - +++ b/include/linux/Makefile.am 30 - @@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) 31 - endif 32 - 33 - if CONFIG_KERNEL 34 - -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux 35 - +kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) 36 - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 37 - endif 38 - diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am 39 - index 651e68b..b80bb55 100644 40 - --- a/include/sys/Makefile.am 41 - +++ b/include/sys/Makefile.am 42 - @@ -89,6 +89,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) 43 - endif 44 - 45 - if CONFIG_KERNEL 46 - -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys 47 - +kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) 48 - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 49 - endif 50 - diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am 51 - index 900ed93..8d9bed2 100644 52 - --- a/include/sys/fm/Makefile.am 53 - +++ b/include/sys/fm/Makefile.am 54 - @@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) 55 - endif 56 - 57 - if CONFIG_KERNEL 58 - -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm 59 - +kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) 60 - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 61 - endif 62 - diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am 63 - index d82d076..b4ae3ee 100644 64 - --- a/include/sys/fm/fs/Makefile.am 65 - +++ b/include/sys/fm/fs/Makefile.am 66 - @@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) 67 - endif 68 - 69 - if CONFIG_KERNEL 70 - -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs 71 - +kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) 72 - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 73 - endif 74 - diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am 75 - index b702679..3c747f4 100644 76 - --- a/include/sys/fs/Makefile.am 77 - +++ b/include/sys/fs/Makefile.am 78 - @@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) 79 - endif 80 - 81 - if CONFIG_KERNEL 82 - -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs 83 - +kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION) 84 - kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 85 - endif
-70
pkgs/os-specific/linux/zfs/module_perm_prefix.patch
··· 1 - *** git-export/module/Makefile.in.orig Wed Dec 31 16:00:01 1969 2 - --- git-export/module/Makefile.in Tue Mar 6 00:23:07 2012 3 - *************** 4 - *** 11,19 **** 5 - @# installed devel headers, or they may be in the module 6 - @# subdirectory when building against the spl source tree. 7 - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ 8 - ! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ 9 - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ 10 - ! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ 11 - else \ 12 - echo -e "\n" \ 13 - "*** Missing spl symbols ensure you have built the spl:\n" \ 14 - --- 11,21 ---- 15 - @# installed devel headers, or they may be in the module 16 - @# subdirectory when building against the spl source tree. 17 - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ 18 - ! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ 19 - ! chmod +w @SPL_SYMBOLS@ .; \ 20 - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ 21 - ! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ 22 - ! chmod +w @SPL_SYMBOLS@ .; \ 23 - else \ 24 - echo -e "\n" \ 25 - "*** Missing spl symbols ensure you have built the spl:\n" \ 26 - *************** 27 - *** 35,55 **** 28 - modules_install: 29 - @# Install the kernel modules 30 - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ 31 - ! INSTALL_MOD_PATH=$(DESTDIR) \ 32 - INSTALL_MOD_DIR=addon/zfs $@ 33 - @# Remove extraneous build products when packaging 34 - ! if [ -n "$(DESTDIR)" ]; then \ 35 - ! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ 36 - -name 'modules.*' | xargs $(RM); \ 37 - fi 38 - ! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ 39 - if [ -f $$sysmap ]; then \ 40 - depmod -ae -F $$sysmap @LINUX_VERSION@; \ 41 - fi 42 - 43 - modules_uninstall: 44 - @# Uninstall the kernel modules 45 - ! $(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs 46 - 47 - distdir: 48 - 49 - --- 37,57 ---- 50 - modules_install: 51 - @# Install the kernel modules 52 - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ 53 - ! INSTALL_MOD_PATH=@prefix@ \ 54 - INSTALL_MOD_DIR=addon/zfs $@ 55 - @# Remove extraneous build products when packaging 56 - ! if [ -n "@prefix@" ]; then \ 57 - ! find @prefix@/lib/modules/@LINUX_VERSION@ \ 58 - -name 'modules.*' | xargs $(RM); \ 59 - fi 60 - ! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ 61 - if [ -f $$sysmap ]; then \ 62 - depmod -ae -F $$sysmap @LINUX_VERSION@; \ 63 - fi 64 - 65 - modules_uninstall: 66 - @# Uninstall the kernel modules 67 - ! $(RM) -R @prefix@/lib/modules/@LINUX_VERSION@/addon/zfs 68 - 69 - distdir: 70 -
+214
pkgs/os-specific/linux/zfs/nix-build.patch
··· 1 + diff -rc zfs-0.6.1.orig/include/linux/Makefile.am zfs-0.6.1/include/linux/Makefile.am 2 + *** zfs-0.6.1.orig/include/linux/Makefile.am 2013-03-26 09:37:47.000000000 -0700 3 + --- zfs-0.6.1/include/linux/Makefile.am 2013-03-28 11:07:10.099129000 -0700 4 + *************** 5 + *** 16,21 **** 6 + endif 7 + 8 + if CONFIG_KERNEL 9 + ! kerneldir = /usr/src/zfs-$(VERSION)/include/linux 10 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 11 + endif 12 + --- 16,21 ---- 13 + endif 14 + 15 + if CONFIG_KERNEL 16 + ! kerneldir = @prefix@/include/linux 17 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 18 + endif 19 + diff -rc zfs-0.6.1.orig/include/Makefile.am zfs-0.6.1/include/Makefile.am 20 + *** zfs-0.6.1.orig/include/Makefile.am 2013-03-26 09:37:47.000000000 -0700 21 + --- zfs-0.6.1/include/Makefile.am 2013-03-28 11:07:38.810870000 -0700 22 + *************** 23 + *** 28,33 **** 24 + endif 25 + 26 + if CONFIG_KERNEL 27 + ! kerneldir = /usr/src/zfs-$(VERSION)/include 28 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 29 + endif 30 + --- 28,33 ---- 31 + endif 32 + 33 + if CONFIG_KERNEL 34 + ! kerneldir = @prefix@/include 35 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 36 + endif 37 + diff -rc zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am zfs-0.6.1/include/sys/fm/fs/Makefile.am 38 + *** zfs-0.6.1.orig/include/sys/fm/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700 39 + --- zfs-0.6.1/include/sys/fm/fs/Makefile.am 2013-03-28 11:07:36.074756000 -0700 40 + *************** 41 + *** 13,18 **** 42 + endif 43 + 44 + if CONFIG_KERNEL 45 + ! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm/fs 46 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 47 + endif 48 + --- 13,18 ---- 49 + endif 50 + 51 + if CONFIG_KERNEL 52 + ! kerneldir = @prefix@/include/sys/fm/fs 53 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 54 + endif 55 + diff -rc zfs-0.6.1.orig/include/sys/fm/Makefile.am zfs-0.6.1/include/sys/fm/Makefile.am 56 + *** zfs-0.6.1.orig/include/sys/fm/Makefile.am 2013-03-26 09:37:47.000000000 -0700 57 + --- zfs-0.6.1/include/sys/fm/Makefile.am 2013-03-28 11:07:32.265896000 -0700 58 + *************** 59 + *** 16,21 **** 60 + endif 61 + 62 + if CONFIG_KERNEL 63 + ! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm 64 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 65 + endif 66 + --- 16,21 ---- 67 + endif 68 + 69 + if CONFIG_KERNEL 70 + ! kerneldir = @prefix@/include/sys/fm 71 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 72 + endif 73 + diff -rc zfs-0.6.1.orig/include/sys/fs/Makefile.am zfs-0.6.1/include/sys/fs/Makefile.am 74 + *** zfs-0.6.1.orig/include/sys/fs/Makefile.am 2013-03-26 09:37:47.000000000 -0700 75 + --- zfs-0.6.1/include/sys/fs/Makefile.am 2013-03-28 11:07:27.592339000 -0700 76 + *************** 77 + *** 13,18 **** 78 + endif 79 + 80 + if CONFIG_KERNEL 81 + ! kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fs 82 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 83 + endif 84 + --- 13,18 ---- 85 + endif 86 + 87 + if CONFIG_KERNEL 88 + ! kerneldir = @prefix@/include/sys/fs 89 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 90 + endif 91 + diff -rc zfs-0.6.1.orig/include/sys/Makefile.am zfs-0.6.1/include/sys/Makefile.am 92 + *** zfs-0.6.1.orig/include/sys/Makefile.am 2013-03-26 09:37:47.000000000 -0700 93 + --- zfs-0.6.1/include/sys/Makefile.am 2013-03-28 11:07:19.045717000 -0700 94 + *************** 95 + *** 91,96 **** 96 + endif 97 + 98 + if CONFIG_KERNEL 99 + ! kerneldir = /usr/src/zfs-$(VERSION)/include/sys 100 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 101 + endif 102 + --- 91,96 ---- 103 + endif 104 + 105 + if CONFIG_KERNEL 106 + ! kerneldir = @prefix@/include/sys 107 + kernel_HEADERS = $(COMMON_H) $(KERNEL_H) 108 + endif 109 + diff -rc zfs-0.6.1.orig/Makefile.am zfs-0.6.1/Makefile.am 110 + *** zfs-0.6.1.orig/Makefile.am 2013-03-26 09:37:47.000000000 -0700 111 + --- zfs-0.6.1/Makefile.am 2013-04-05 23:49:39.763623000 -0700 112 + *************** 113 + *** 9,18 **** 114 + if CONFIG_KERNEL 115 + SUBDIRS += module 116 + 117 + ! extradir = /usr/src/zfs-$(VERSION) 118 + extra_HEADERS = zfs.release.in zfs_config.h.in 119 + 120 + ! kerneldir = /usr/src/zfs-$(VERSION)/$(LINUX_VERSION) 121 + nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) 122 + endif 123 + 124 + --- 9,18 ---- 125 + if CONFIG_KERNEL 126 + SUBDIRS += module 127 + 128 + ! extradir = @prefix@/libexec/zfs-$(VERSION) 129 + extra_HEADERS = zfs.release.in zfs_config.h.in 130 + 131 + ! kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION) 132 + nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS) 133 + endif 134 + 135 + diff -rc zfs-0.6.1.orig/module/Makefile.in zfs-0.6.1/module/Makefile.in 136 + *** zfs-0.6.1.orig/module/Makefile.in 2013-03-26 09:37:47.000000000 -0700 137 + --- zfs-0.6.1/module/Makefile.in 2013-04-05 23:50:41.497876000 -0700 138 + *************** 139 + *** 18,26 **** 140 + @# installed devel headers, or they may be in the module 141 + @# subdirectory when building against the spl source tree. 142 + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ 143 + ! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ 144 + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ 145 + ! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ 146 + else \ 147 + echo -e "\n" \ 148 + "*** Missing spl symbols ensure you have built the spl:\n" \ 149 + --- 18,26 ---- 150 + @# installed devel headers, or they may be in the module 151 + @# subdirectory when building against the spl source tree. 152 + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ 153 + ! cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ 154 + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ 155 + ! cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ 156 + else \ 157 + echo -e "\n" \ 158 + "*** Missing spl symbols ensure you have built the spl:\n" \ 159 + *************** 160 + *** 28,33 **** 161 + --- 28,35 ---- 162 + "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \ 163 + exit 1; \ 164 + fi 165 + + @# when copying a file out of the nix store, we need to make it writable again. 166 + + chmod +w @SPL_SYMBOLS@ 167 + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@ 168 + 169 + clean: 170 + *************** 171 + *** 42,62 **** 172 + modules_install: 173 + @# Install the kernel modules 174 + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ 175 + ! INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ 176 + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) 177 + @# Remove extraneous build products when packaging 178 + ! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ 179 + if [ -n $$kmoddir ]; then \ 180 + find $$kmoddir -name 'modules.*' | xargs $(RM); \ 181 + fi 182 + ! sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ 183 + if [ -f $$sysmap ]; then \ 184 + depmod -ae -F $$sysmap @LINUX_VERSION@; \ 185 + fi 186 + 187 + modules_uninstall: 188 + @# Uninstall the kernel modules 189 + ! kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ 190 + list='$(subdir-m)'; for subdir in $$list; do \ 191 + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ 192 + done 193 + --- 44,64 ---- 194 + modules_install: 195 + @# Install the kernel modules 196 + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ 197 + ! INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ 198 + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) 199 + @# Remove extraneous build products when packaging 200 + ! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ 201 + if [ -n $$kmoddir ]; then \ 202 + find $$kmoddir -name 'modules.*' | xargs $(RM); \ 203 + fi 204 + ! sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ 205 + if [ -f $$sysmap ]; then \ 206 + depmod -ae -F $$sysmap @LINUX_VERSION@; \ 207 + fi 208 + 209 + modules_uninstall: 210 + @# Uninstall the kernel modules 211 + ! kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ 212 + list='$(subdir-m)'; for subdir in $$list; do \ 213 + $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ 214 + done
-25
pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch
··· 1 - *** git-export/module/Makefile.in.old Tue Mar 6 01:04:48 2012 2 - --- git-export/module/Makefile.in Tue Mar 6 01:04:59 2012 3 - *************** 4 - *** 11,20 **** 5 - @# installed devel headers, or they may be in the module 6 - @# subdirectory when building against the spl source tree. 7 - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ 8 - ! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ 9 - chmod +w @SPL_SYMBOLS@ .; \ 10 - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ 11 - ! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ 12 - chmod +w @SPL_SYMBOLS@ .; \ 13 - else \ 14 - echo -e "\n" \ 15 - --- 11,20 ---- 16 - @# installed devel headers, or they may be in the module 17 - @# subdirectory when building against the spl source tree. 18 - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ 19 - ! cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ 20 - chmod +w @SPL_SYMBOLS@ .; \ 21 - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ 22 - ! cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ 23 - chmod +w @SPL_SYMBOLS@ .; \ 24 - else \ 25 - echo -e "\n" \
+12 -2
pkgs/servers/amqp/rabbitmq-server/default.nix
··· 2 2 , docbook_xml_dtd_45, docbook_xsl, zip, unzip }: 3 3 4 4 stdenv.mkDerivation rec { 5 - name = "rabbitmq-server-3.0.3"; 5 + name = "rabbitmq-server-${version}"; 6 + 7 + version = "3.0.3"; 6 8 7 9 src = fetchurl { 8 - url = "http://www.rabbitmq.com/releases/rabbitmq-server/v3.0.3/${name}.tar.gz"; 10 + url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz"; 9 11 sha256 = "07mp57xvszdrlgw8rgn9r9dpa6vdqdjk7f1dyh6a9sdg8s9fby38"; 10 12 }; 11 13 ··· 19 21 ''; 20 22 21 23 installFlags = "TARGET_DIR=$(out)/libexec/rabbitmq SBIN_DIR=$(out)/sbin MAN_DIR=$(out)/share/man"; 24 + 25 + preInstall = 26 + '' 27 + sed -i \ 28 + -e 's|SYS_PREFIX=|SYS_PREFIX=''${SYS_PREFIX-''${HOME}/.rabbitmq/${version}}|' \ 29 + -e 's|CONF_ENV_FILE=''${SYS_PREFIX}\(.*\)|CONF_ENV_FILE=\1|' \ 30 + scripts/rabbitmq-defaults 31 + ''; 22 32 23 33 postInstall = 24 34 ''
+12 -5
pkgs/tools/networking/wicd/default.nix
··· 1 1 {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, 2 2 wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, iputils, 3 - locale ? "C" }: 3 + pythonPackages, locale ? "C" }: 4 4 5 5 # Wicd has a ncurses interface that we do not build because it depends 6 6 # on urwid which has not been packaged at this time (2009-12-27). ··· 14 14 sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; 15 15 }; 16 16 17 - buildInputs = [ python ]; 17 + buildInputs = [ python pythonPackages.Babel ]; 18 18 19 - patches = [ ./no-var-install.patch ./no-trans.patch ./mkdir-networks.patch ./pygtk.patch ./no-optimization.patch ]; 19 + patches = [ 20 + ./no-var-install.patch 21 + ./pygtk.patch 22 + ./no-optimization.patch 23 + ./dhclient.patch 24 + ./fix-app-icon.patch 25 + ./fix-gtk-issues.patch 26 + ]; 20 27 21 28 # Should I be using pygtk's propogated build inputs? 22 29 # !!! Should use makeWrapper. ··· 28 35 29 36 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 30 37 sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in 31 - sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in 32 38 sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in 33 39 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 34 40 sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in 35 41 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 36 42 sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in 37 43 sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in 44 + rm po/ast.po 38 45 ''; 39 46 40 47 configurePhase = '' ··· 62 69 --systemd=$out/lib/systemd/ \ 63 70 --logrotate=$out/etc/logrotate.d/ \ 64 71 --desktop=$out/share/applications/ \ 65 - --icons=$out/share/icons/hicolour/ \ 72 + --icons=$out/share/icons/hicolor/ \ 66 73 --translations=$out/share/locale/ \ 67 74 --autostart=$out/etc/xdg/autostart/ \ 68 75 --varlib=$out/var/lib/ \
+101
pkgs/tools/networking/wicd/dhclient.patch
··· 1 + diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py 2 + --- wicd-1.7.2.4.orig/wicd/wnettools.py 2013-03-30 21:47:19.804907552 +0000 3 + +++ wicd-1.7.2.4/wicd/wnettools.py 2013-03-31 08:44:37.572792110 +0000 4 + @@ -37,6 +37,7 @@ 5 + import time 6 + from string import maketrans, translate 7 + 8 + +import tempfile 9 + import wpath 10 + import misc 11 + from misc import find_path 12 + @@ -216,6 +217,7 @@ 13 + self.flush_tool = None 14 + self.link_detect = None 15 + self.dhcp_object = None 16 + + self.dhclient_conf_path = None; 17 + 18 + def SetDebugMode(self, value): 19 + """ If True, verbose output is enabled. """ 20 + @@ -277,12 +279,6 @@ 21 + cmd = "" 22 + return (client, cmd) 23 + 24 + - # probably /var/lib/wicd/dhclient.conf with defaults 25 + - dhclient_conf_path = os.path.join( 26 + - wpath.varlib, 27 + - 'dhclient.conf' 28 + - ) 29 + - 30 + client_dict = { 31 + "dhclient" : 32 + {'connect' : r"%(cmd)s -cf %(dhclientconf)s %(iface)s", 33 + @@ -307,41 +303,44 @@ 34 + } 35 + (client_name, cmd) = get_client_name(self.DHCP_CLIENT) 36 + 37 + - # cause dhclient doesn't have a handy dandy argument 38 + - # for specifing the hostname to be sent 39 + - if client_name == "dhclient" and flavor: 40 + - if hostname == None: 41 + - # <hostname> will use the system hostname 42 + - # we'll use that if there is hostname passed 43 + - # that shouldn't happen, though 44 + - hostname = '<hostname>' 45 + - print 'attempting to set hostname with dhclient' 46 + - print 'using dhcpcd or another supported client may work better' 47 + - dhclient_template = \ 48 + - open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r') 49 + - 50 + - output_conf = open(dhclient_conf_path, 'w') 51 + - 52 + - for line in dhclient_template.readlines(): 53 + - line = line.replace('$_HOSTNAME', hostname) 54 + - output_conf.write(line) 55 + - 56 + - output_conf.close() 57 + - dhclient_template.close() 58 + - os.chmod(dhclient_conf_path, 0644) 59 + - 60 + if not client_name or not cmd: 61 + print "WARNING: Failed to find a valid dhcp client!" 62 + return "" 63 + 64 + if flavor == "connect": 65 + + # cause dhclient doesn't have a handy dandy argument 66 + + # for specifing the hostname to be sent 67 + + if client_name == "dhclient" and flavor: 68 + + if hostname == None: 69 + + # <hostname> will use the system hostname 70 + + # we'll use that if there is hostname passed 71 + + # that shouldn't happen, though 72 + + hostname = '<hostname>' 73 + + print 'attempting to set hostname with dhclient' 74 + + print 'using dhcpcd or another supported client may work better' 75 + + if not self.dhclient_conf_path: 76 + + _,self.dhclient_conf_path = tempfile.mkstemp() 77 + + print 'New dhclient conf path: %s ' % self.dhclient_conf_path 78 + + dhclient_template = \ 79 + + open(os.path.join(wpath.etc, 'dhclient.conf.template'), 'r') 80 + + 81 + + output_conf = open(self.dhclient_conf_path, 'w') 82 + + 83 + + for line in dhclient_template.readlines(): 84 + + line = line.replace('$_HOSTNAME', hostname) 85 + + output_conf.write(line) 86 + + 87 + + output_conf.close() 88 + + dhclient_template.close() 89 + + os.chmod(self.dhclient_conf_path, 0644) 90 + + 91 + if not hostname: 92 + hostname = os.uname()[1] 93 + return client_dict[client_name]['connect'] % \ 94 + { "cmd" : cmd, 95 + "iface" : self.iface, 96 + "hostname" : hostname, 97 + - 'dhclientconf' : dhclient_conf_path } 98 + + 'dhclientconf' : self.dhclient_conf_path } 99 + elif flavor == "release": 100 + return client_dict[client_name]['release'] % {"cmd":cmd, "iface":self.iface} 101 + else:
+19
pkgs/tools/networking/wicd/fix-app-icon.patch
··· 1 + Someone forgot to pack wicd.png icon. We will replace it with existing one. 2 + 3 + diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py 4 + --- wicd-1.7.2.4.orig/gtk/gui.py 2013-03-30 21:47:19.802907553 +0000 5 + +++ wicd-1.7.2.4/gtk/gui.py 2013-03-31 08:13:32.876871673 +0000 6 + @@ -205,8 +205,10 @@ 7 + 8 + self.status_area.hide_all() 9 + 10 + - if os.path.exists(os.path.join(wpath.images, "wicd.png")): 11 + - self.window.set_icon_from_file(os.path.join(wpath.images, "wicd.png")) 12 + + if os.path.exists(os.path.join(wpath.images, "../../icons/hicolour/128x128/apps/wicd-gtk.png")): 13 + + self.window.set_icon_from_file(os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png")) 14 + + else: 15 + + print 'icon doesn\'t exist %s' % os.path.join(wpath.images, "../../icons/hicolor/128x128/apps/wicd-gtk.png") 16 + self.statusID = None 17 + self.first_dialog_load = True 18 + self.is_visible = True 19 +
+47
pkgs/tools/networking/wicd/fix-gtk-issues.patch
··· 1 + diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py 2 + --- wicd-1.7.2.4.orig/gtk/gui.py 2013-03-31 17:01:29.367001288 +0000 3 + +++ wicd-1.7.2.4/gtk/gui.py 2013-03-31 17:55:20.826028396 +0000 4 + @@ -35,7 +35,7 @@ 5 + from wicd import misc 6 + from wicd import wpath 7 + from wicd import dbusmanager 8 + -from wicd.misc import noneToString 9 + +from wicd.misc import noneToString, _status_dict 10 + from wicd.translations import _, language 11 + import prefs 12 + from prefs import PreferencesDialog 13 + @@ -250,7 +250,7 @@ 14 + 15 + def handle_connection_results(self, results): 16 + if results not in ['success', 'aborted'] and self.is_visible: 17 + - error(self.window, language[results], block=False) 18 + + error(self.window, misc._status_dict[results], block=False) 19 + 20 + def create_adhoc_network(self, widget=None): 21 + """ Shows a dialog that creates a new adhoc network. """ 22 + diff -ruN wicd-1.7.2.4.orig/po/ru.po wicd-1.7.2.4/po/ru.po 23 + --- wicd-1.7.2.4.orig/po/ru.po 2013-03-31 17:01:29.362001288 +0000 24 + +++ wicd-1.7.2.4/po/ru.po 2013-03-31 17:43:37.909022515 +0000 25 + @@ -173,7 +173,7 @@ 26 + 27 + #: wicd/misc.py:79 28 + msgid "Connection Failed: Bad password" 29 + -msgstr "Ошибка соединения: Неверный пароль:" 30 + +msgstr "Ошибка соединения: Неверный пароль" 31 + 32 + #: wicd/misc.py:89 33 + msgid "Connection Failed: No DHCP offers received." 34 + diff -ruN wicd-1.7.2.4.orig/wicd/misc.py wicd-1.7.2.4/wicd/misc.py 35 + --- wicd-1.7.2.4.orig/wicd/misc.py 2013-03-31 17:01:29.369001288 +0000 36 + +++ wicd-1.7.2.4/wicd/misc.py 2013-03-31 17:23:56.822012593 +0000 37 + @@ -430,7 +430,9 @@ 38 + """ Sanitize property names to be used in config-files. """ 39 + allowed = string.ascii_letters + '_' + string.digits 40 + table = string.maketrans(allowed, ' ' * len(allowed)) 41 + - return s.translate(None, table) 42 + + #return s.translate(None, table) 43 + + #return s.translate(table) 44 + + return s 45 + 46 + def sanitize_escaped(s): 47 + """ Sanitize double-escaped unicode strings. """
-12
pkgs/tools/networking/wicd/mkdir-networks.patch
··· 1 - wicd normally makes the NETWORKS directory and install the dhclient.conf.template.default at install time, 2 - but we cannot do that, so we make it at runtime instead. 3 - 4 - --- wicd-1.7.0/in/scripts=wicd.in 2010-01-14 23:49:11.000000000 -0500 5 - +++ wicd-1.7.0/in/scripts=wicd.in 2010-11-16 22:35:50.272555487 -0500 6 - @@ -1,3 +1,6 @@ 7 - #!/bin/bash 8 - 9 - +mkdir -p %NETWORKS% 10 - +ln -sf @TEMPLATE-DEFAULT@ %ETC%dhclient.conf.template.default 11 - + 12 - exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@
-15
pkgs/tools/networking/wicd/no-trans.patch
··· 1 - --- wicd-1.7.2.4/setup.py 2013-03-14 21:28:21.360580941 +0100 2 - +++ wicd-1.7.2.4/setup.py 2013-03-14 21:22:50.125721943 +0100 3 - @@ -599,12 +599,6 @@ 4 - if not wpath.no_install_pmutils: 5 - data.append((wpath.pmutils, ['other/55wicd'])) 6 - print 'Using pid path', os.path.basename(wpath.pidfile) 7 - - print 'Language support for', 8 - - for pofile in glob('po/*.po'): 9 - - language = pofile.replace('po/', '').replace('.po', '') 10 - - print language, 11 - - data.append((wpath.translations + language + '/LC_MESSAGES/', 12 - - ['translations/' + language + '/LC_MESSAGES/wicd.mo'])) 13 - print 14 - except Exception, e: 15 - print str(e)
+8 -2
pkgs/top-level/all-packages.nix
··· 4007 4007 4008 4008 gts = callPackage ../development/libraries/gts { }; 4009 4009 4010 + gvfs = callPackage ../development/libraries/gvfs { }; 4011 + 4010 4012 gwenhywfar = callPackage ../development/libraries/gwenhywfar { }; 4011 4013 4012 4014 # TODO : Add MIT Kerberos and let admin choose. ··· 6208 6210 config = config.pcmciaUtils.config or null; 6209 6211 }; 6210 6212 6213 + plymouth = callPackage ../os-specific/linux/plymouth { }; 6214 + 6211 6215 pmount = callPackage ../os-specific/linux/pmount { }; 6212 6216 6213 6217 pmutils = callPackage ../os-specific/linux/pm-utils { }; ··· 6320 6324 udev145 = callPackage ../os-specific/linux/udev/145.nix { }; 6321 6325 udev = pkgs.systemd; 6322 6326 6323 - udisks = callPackage ../os-specific/linux/udisks { }; 6327 + udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; 6328 + udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; 6329 + udisks = udisks1; 6324 6330 6325 6331 untie = callPackage ../os-specific/linux/untie { }; 6326 6332 ··· 7193 7199 gphoto2 = callPackage ../applications/misc/gphoto2 { }; 7194 7200 7195 7201 gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix { 7196 - inherit libgphoto2 fuse pkgconfig glib; 7202 + inherit libgphoto2 fuse pkgconfig glib libtool; 7197 7203 }; 7198 7204 7199 7205 graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
+3
pkgs/top-level/haskell-defaults.nix
··· 53 53 cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; 54 54 monadPar = self.monadPar_0_1_0_3; 55 55 jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; 56 + prettyShow = self.prettyShow_1_2; 56 57 }; 57 58 58 59 ghc703Prefs = ··· 62 63 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; }; 63 64 monadPar = self.monadPar_0_1_0_3; 64 65 jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; 66 + prettyShow = self.prettyShow_1_2; 65 67 }; 66 68 67 69 ghc702Prefs = ghc701Prefs; ··· 73 75 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; }; 74 76 monadPar = self.monadPar_0_1_0_3; 75 77 jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; 78 + prettyShow = self.prettyShow_1_2; 76 79 }; 77 80 78 81 ghc6123Prefs = ghc6122Prefs;
+17 -1
pkgs/top-level/haskell-packages.nix
··· 89 89 ghc = ghc; # refers to ghcPlain 90 90 }; 91 91 92 + # The normal GHC wrapper doesn't create links to the documentation in 93 + # ~/.nix-profile. Having this second wrapper allows us to remedy the 94 + # situation without re-building all Haskell packages. At the next 95 + # stdenv-updates merge, this second wrapper will go away. 96 + 97 + ghcUserEnvWrapper = pkgs.appendToName "new" (callPackage ../development/compilers/ghc/wrapper.nix { 98 + ghc = ghc; # refers to ghcPlain 99 + forUserEnv = true; 100 + }); 101 + 92 102 # An experimental wrapper around ghcPlain that does not automatically 93 103 # pick up packages from the profile, but instead has a fixed set of packages 94 104 # in its global database. The set of packages can be specified as an ··· 605 615 Chart = callPackage ../development/libraries/haskell/Chart {}; 606 616 607 617 ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {}; 618 + 619 + checkers = callPackage ../development/libraries/haskell/checkers {}; 608 620 609 621 citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; 610 622 ··· 1471 1483 1472 1484 ppm = callPackage ../development/libraries/haskell/ppm {}; 1473 1485 1474 - prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; 1486 + prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; 1487 + prettyShow_1_5 = callPackage ../development/libraries/haskell/pretty-show/1.5.nix {}; 1488 + prettyShow = self.prettyShow_1_5; 1475 1489 1476 1490 punycode = callPackage ../development/libraries/haskell/punycode {}; 1477 1491 ··· 1894 1908 waiAppStatic = callPackage ../development/libraries/haskell/wai-app-static {}; 1895 1909 1896 1910 waiExtra = callPackage ../development/libraries/haskell/wai-extra {}; 1911 + 1912 + waiHandlerLaunch = callPackage ../development/libraries/haskell/wai-handler-launch {}; 1897 1913 1898 1914 waiLogger = callPackage ../development/libraries/haskell/wai-logger {}; 1899 1915
-1
pkgs/top-level/release-python.nix
··· 1806 1806 gigolo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; 1807 1807 gtk_xfce_engine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; 1808 1808 gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; 1809 - libgdu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; 1810 1809 libxfce4ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; 1811 1810 libxfce4util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; 1812 1811 libxfcegui4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };