From 22ece175a061e4b1323869007c550bfa02a7972a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Thu, 4 Oct 2012 23:32:34 -0700 Subject: [PATCH 01/51] - openttd 1.2.2, rili 2.0.1, widelands-build17, uqm-0.7.0 --- pkgs/games/openttd/default.nix | 21 +- pkgs/games/rili/default.nix | 24 ++ pkgs/games/rili/moderinze_cpp.patch | 391 ++++++++++++++++++ pkgs/games/uqm/default.nix | 71 ++++ .../boost_and_cmake_die_die_die.patch | 11 + pkgs/games/widelands/default.nix | 11 +- pkgs/top-level/all-packages.nix | 4 + 7 files changed, 523 insertions(+), 10 deletions(-) create mode 100644 pkgs/games/rili/default.nix create mode 100644 pkgs/games/rili/moderinze_cpp.patch create mode 100644 pkgs/games/uqm/default.nix create mode 100644 pkgs/games/widelands/boost_and_cmake_die_die_die.patch diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 66c296b487a..48782a60277 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,19 +1,28 @@ -{stdenv, fetchurl, SDL, libpng, zlib}: +{stdenv, fetchurl, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig}: stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "0.6.0"; + version = "1.2.2"; src = fetchurl { - url = "mirror://sf/openttd/${name}-source.tar.bz2"; - md5 = "dcf63687c73ff56887049fedaf6c6019"; + url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; + sha256 = "158znfx389bhs9gd2hadnbc2a32z4ma1vz8704cmw9yh0fmhbcap"; }; - buildInputs = [SDL libpng]; + buildInputs = [SDL libpng pkgconfig xz zlib freetype fontconfig]; prefixKey = "--prefix-dir="; - configureFlags = "--with-zlib=${zlib}/lib/libz.a"; + + configureFlags = '' + --with-zlib=${zlib}/lib/libz.a + --without-liblzo2 + ''; + makeFlags = "INSTALL_PERSONAL_DIR="; + postInstall = '' + mv $out/games/ $out/bin + ''; + meta = { description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".''; homepage = http://www.openttd.org/; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix new file mode 100644 index 00000000000..95878e2fa7f --- /dev/null +++ b/pkgs/games/rili/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, SDL_mixer, SDL, autoconf, automake}: + +stdenv.mkDerivation { + name = "ri_li-2.0.1"; + + src = fetchurl { + url = mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2; + sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd"; + }; + + patches = [ ./moderinze_cpp.patch ]; + + preConfigure = '' + export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include" + ''; + + buildInputs = [SDL SDL_mixer autoconf automake]; + + meta = { + homepage = http://ri-li.sourceforge.net; + license = "GPL2+"; + description = "Ri-li is an arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches to win."; + }; +} diff --git a/pkgs/games/rili/moderinze_cpp.patch b/pkgs/games/rili/moderinze_cpp.patch new file mode 100644 index 00000000000..3d076afb39e --- /dev/null +++ b/pkgs/games/rili/moderinze_cpp.patch @@ -0,0 +1,391 @@ +diff -r -u Ri-li-2.0.1.orig/src/audio.cc Ri-li-2.0.1/src/audio.cc +--- Ri-li-2.0.1.orig/src/audio.cc 2012-01-22 00:40:56.928609371 -0800 ++++ Ri-li-2.0.1/src/audio.cc 2012-01-22 00:28:33.360636539 -0800 +@@ -22,8 +22,8 @@ + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + #include +-#include +-#include ++#include ++#include + + #include "audio.h" + #include "utils.h" +@@ -57,7 +57,7 @@ + char PathFile[512]; + + if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) { +- cerr <<"Enable to init Sound card ! "< ++#include + #include + #include + #include +diff -r -u Ri-li-2.0.1.orig/src/editeur.cc Ri-li-2.0.1/src/editeur.cc +--- Ri-li-2.0.1.orig/src/editeur.cc 2007-11-02 04:48:17.000000000 -0700 ++++ Ri-li-2.0.1/src/editeur.cc 2012-01-22 00:28:59.632635579 -0800 +@@ -25,10 +25,10 @@ + #include + #endif + +-#include ++#include + #include + #include +-#include ++#include + #include + #include + +@@ -374,7 +374,7 @@ + + // Sauve le niveau + if(Niveau.Save()==false) { +- cerr <<"ERREUR Saving levels!"< + #endif + +-#include ++#include + #include + #include +-#include ++#include + #include + #include + +diff -r -u Ri-li-2.0.1.orig/src/loco.cc Ri-li-2.0.1/src/loco.cc +--- Ri-li-2.0.1.orig/src/loco.cc 2007-11-02 04:48:18.000000000 -0700 ++++ Ri-li-2.0.1/src/loco.cc 2012-01-22 00:14:17.878797797 -0800 +@@ -21,10 +21,10 @@ + // with this program; if not, write to the Free Software Foundation, Inc., + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-#include ++#include + #include + #include +-#include ++#include + #include + #include "preference.h" + #include "loco.h" +diff -r -u Ri-li-2.0.1.orig/src/main.cc Ri-li-2.0.1/src/main.cc +--- Ri-li-2.0.1.orig/src/main.cc 2007-11-02 04:48:19.000000000 -0700 ++++ Ri-li-2.0.1/src/main.cc 2012-01-22 00:29:40.080634136 -0800 +@@ -23,8 +23,8 @@ + + #include + #include +-#include +-#include ++#include ++#include + #include + #include + +@@ -115,7 +115,7 @@ + + // Initilise SDL + if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) { +- cerr <<"Impossible d'initialiser SDL:"<vfmt->BitsPerPixel==8) { +- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<vfmt->BitsPerPixel,vOption); + + if(sdlVideo==NULL) { +- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"< ++#include + #include + #include +-#include ++#include + #include "preference.h" + #include "menu.h" + #include "sprite.h" +@@ -92,7 +92,7 @@ + // Teste la resolution video + sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo(); + if(sdlVideoInfo->vfmt->BitsPerPixel==8) { +- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<vfmt->BitsPerPixel,vOption); + if(sdlVideo==NULL) { +- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"< ++#include + #include + #include "mouse.h" + #include "preference.h" +diff -r -u Ri-li-2.0.1.orig/src/sprite.cc Ri-li-2.0.1/src/sprite.cc +--- Ri-li-2.0.1.orig/src/sprite.cc 2007-11-02 04:48:20.000000000 -0700 ++++ Ri-li-2.0.1/src/sprite.cc 2012-01-22 00:30:43.640631779 -0800 +@@ -21,10 +21,10 @@ + // with this program; if not, write to the Free Software Foundation, Inc., + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-#include ++#include + #include + #include +-#include ++#include + #include + #include "sprite.h" + #include "preference.h" +@@ -84,7 +84,7 @@ + strcpy(PathFile,Langue[Pref.Langue]); + GetPath(PathFile); + if(FileExiste(PathFile)==false) { +- cerr <<"Impossible de trouver "< ++#include + #include + #include + #include "preference.h" +diff -r -u Ri-li-2.0.1.orig/src/utils.cc Ri-li-2.0.1/src/utils.cc +--- Ri-li-2.0.1.orig/src/utils.cc 2007-11-02 04:48:22.000000000 -0700 ++++ Ri-li-2.0.1/src/utils.cc 2012-01-22 00:31:30.944630051 -0800 +@@ -21,10 +21,10 @@ + // with this program; if not, write to the Free Software Foundation, Inc., + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-#include ++#include + #include + #include +-#include ++#include + + #ifdef WINDOWS + #include +@@ -77,7 +77,7 @@ + + file=fopen(Path,"r"); + if(!file) { +- cerr <<"ERREUR: Impossible d'ouvrir '"<1024) { + AfficheChargeur(); + if( fread(Po,1,1024,file) != 1024 ) { +- cerr <<"ERREUR de lecture du fichier '"<512) { + if( fwrite(Buf,1,512,file) != 512 ) { +- cerr <<"ERREUR d'ecriture du fichier '"<0) { + if( fwrite(Buf,1,(size_t)L,file) != (size_t)L ) { +- cerr <<"ERREUR d'ecriture du fichier '"<> config.state + echo "INPUT_install_bindir_VALUE='$out/bin'" >> config.state + echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state + echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state + PREFIX=$out ./build.sh uqm config + ''; + + buildPhase = '' + ./build.sh uqm + ''; + + installPhase = '' + ./build.sh uqm install + sed -i $out/bin/uqm -e "s%/usr/local/games/%$out%g" + ''; + + meta = { + description = ''Urquan Masters is an open source clone of the Classic top-down space battle Star Cotnrol ''; + homepage = http://sc2.sourceforge.net/; + license = "GPLv2"; + }; +} diff --git a/pkgs/games/widelands/boost_and_cmake_die_die_die.patch b/pkgs/games/widelands/boost_and_cmake_die_die_die.patch new file mode 100644 index 00000000000..f008be35e37 --- /dev/null +++ b/pkgs/games/widelands/boost_and_cmake_die_die_die.patch @@ -0,0 +1,11 @@ +--- widelands-build17-src.old/CMakeLists.txt 2012-04-23 02:46:49.000000000 -0700 ++++ widelands-build17-src/CMakeLists.txt 2012-07-14 19:49:14.000000000 -0700 +@@ -140,8 +140,6 @@ + else (WL_UNIT_TESTS) + message(STATUS "Disabled Unit Tests") + set (Boost_FIND_COMPONENTS signals) +- set (Boost_USE_STATIC_LIBS ON) +- set (Boost_USE_MULTITHREADED ON) + set (Boost_DETAILED_FAILURE_MSG ON) + find_package(Boost 1.35.0 COMPONENTS signals REQUIRED) + endif (WL_UNIT_TESTS) diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 74d1f87e0be..8f3270db481 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -13,11 +13,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="widelands"; - version="build16"; + version="build17"; name="${baseName}-${version}"; project="${baseName}"; - url="http://launchpad.net/${project}/${version}/${version}/+download/${name}-src.tar.bz2"; - hash="0pb2d73c6hynhp1x54rcfbibrrri7lyxjybd1hicn503qcakrnyq"; + url="https://launchpadlibrarian.net/102893896/widelands-build17-src.tar.bz2"; + hash="be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5"; }; in rec { @@ -30,7 +30,9 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["killBuildDir" "doCmake" "doMakeInstall" "createScript"]; + phaseNames = ["killBuildDir" "doPatch" "doCmake" "doMakeInstall" "createScript"]; + + patches = [ ./boost_and_cmake_die_die_die.patch ]; killBuildDir = a.fullDepEntry '' rm -r build @@ -38,6 +40,7 @@ rec { cmakeFlags = [ "-DLUA_LIBRARIES=-llua" + "-DWL_PORTABLE=true" ]; createScript = a.fullDepEntry '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd554b7f1d1..0c0647c60f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8177,6 +8177,8 @@ let mygui = myguiSvn; }; + rili = callPackage ../games/rili { }; + rogue = callPackage ../games/rogue { }; sauerbraten = callPackage ../games/sauerbraten {}; @@ -8257,6 +8259,8 @@ let lua = lua5; }; + uqm = callPackage ../games/uqm { }; + urbanterror = callPackage ../games/urbanterror { }; ut2004demo = callPackage ../games/ut2004demo { }; From 27ec2773594b8f6aae88c6f73ebbd2725f443d4e Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Thu, 4 Oct 2012 23:39:00 -0700 Subject: [PATCH 02/51] - add myself as a maintainer for the packages I've added --- pkgs/games/openttd/default.nix | 1 + pkgs/games/rili/default.nix | 1 + pkgs/games/uqm/default.nix | 1 + pkgs/games/widelands/default.nix | 1 + pkgs/lib/maintainers.nix | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 48782a60277..70b03a4e483 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".''; homepage = http://www.openttd.org/; license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 95878e2fa7f..b3563f42341 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = http://ri-li.sourceforge.net; license = "GPL2+"; description = "Ri-li is an arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches to win."; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 3be95849e32..fd6d727e734 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { description = ''Urquan Masters is an open source clone of the Classic top-down space battle Star Cotnrol ''; homepage = http://sc2.sourceforge.net/; license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 8f3270db481..62ec56b2f7a 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -56,6 +56,7 @@ rec { maintainers = with a.lib.maintainers; [ raskin + jcumming ]; platforms = with a.lib.platforms; linux; diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 127295a2feb..18671255fce 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -18,6 +18,7 @@ garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; + jcumming = "Jack Cummings "; kkallio = "Karn Kallio "; ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; From 8eb9491a22cd57415ba10470b7c7950e712ec4c0 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 00:09:49 -0700 Subject: [PATCH 03/51] - zfs-0.6.0-rc11, and spl-0.6.0-rc11 --- pkgs/lib/licenses.nix | 6 + pkgs/os-specific/linux/spl/default.nix | 39 +++++ .../linux/spl/install_prefix.patch | 19 +++ .../linux/spl/install_prefix_2.patch | 32 ++++ .../os-specific/linux/spl/module_prefix.patch | 33 +++++ pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 +++ pkgs/os-specific/linux/zfs/default.nix | 34 +++++ .../linux/zfs/kerneldir_path.patch | 140 ++++++++++++++++++ .../linux/zfs/module_perm_prefix.patch | 70 +++++++++ .../linux/zfs/mount_zfs_prefix.patch | 24 +++ .../zfs/no_absolute_paths_to_coreutils.patch | 25 ++++ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 +++ pkgs/top-level/all-packages.nix | 4 + 13 files changed, 473 insertions(+) create mode 100644 pkgs/os-specific/linux/spl/default.nix create mode 100644 pkgs/os-specific/linux/spl/install_prefix.patch create mode 100644 pkgs/os-specific/linux/spl/install_prefix_2.patch create mode 100644 pkgs/os-specific/linux/spl/module_prefix.patch create mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix create mode 100644 pkgs/os-specific/linux/zfs/default.nix create mode 100644 pkgs/os-specific/linux/zfs/kerneldir_path.patch create mode 100644 pkgs/os-specific/linux/zfs/module_perm_prefix.patch create mode 100644 pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch create mode 100644 pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch create mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 87f9298706e..e1743bddf69 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -34,6 +34,12 @@ url = https://fedoraproject.org/wiki/Licensing/BSD; }; + cddl = { + shortName = "CDDL"; + fullName = "Common Development Distribution License "; + url = http://www.opensolaris.org/os/licensing/cddllicense.txt; + }; + cpl10 = { shortName = "CPL 1.0"; fullName = "Common Public License version 1.0"; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix new file mode 100644 index 00000000000..96565fffa0e --- /dev/null +++ b/pkgs/os-specific/linux/spl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc11"; + src = fetchurl { + url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc11.tar.gz; + sha256 = "0brsrr9hvzlpx7a26nn8rw9k2kh9s75hmxp6h087hi64hzxysf8g"; + }; + + patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel autoconf automake libtool ]; + + NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + + preConfigure = '' + ./autogen.sh + + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + 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" + ''; + + configureFlags = '' + --with-linux=${kernel}/lib/modules/${kernel.version}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build + ''; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.cddl; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch new file mode 100644 index 00000000000..9a7393b7170 --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -0,0 +1,19 @@ +*** 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 +*************** +*** 32,38 **** + 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 ---- + 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; \ + done diff --git a/pkgs/os-specific/linux/spl/install_prefix_2.patch b/pkgs/os-specific/linux/spl/install_prefix_2.patch new file mode 100644 index 00000000000..6068ad1d69c --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix_2.patch @@ -0,0 +1,32 @@ +*** 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 diff --git a/pkgs/os-specific/linux/spl/module_prefix.patch b/pkgs/os-specific/linux/spl/module_prefix.patch new file mode 100644 index 00000000000..dd40711ccdb --- /dev/null +++ b/pkgs/os-specific/linux/spl/module_prefix.patch @@ -0,0 +1,33 @@ +*** 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 diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix new file mode 100644 index 00000000000..c174daad26b --- /dev/null +++ b/pkgs/os-specific/linux/spl/spl-0.6.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, perl }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/spl.git; + rev = "dde6b7b137f56894a457"; + sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; + }; + + patches = [ ./install_prefix.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel linuxHeaders ]; + + configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" + "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix new file mode 100644 index 00000000000..43e7b2fd95d --- /dev/null +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, kernel, spl, perl, zlib, libuuid, coreutils, utillinux }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc11"; + src = fetchurl { + url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz; + sha256 = "0wx0srn2k31j9xdk3nvk7l847r0diyb7ph6hd006ax9l5p9zj0a7"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; + + buildInputs = [ kernel spl perl zlib libuuid coreutils ]; + + NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + + preConfigure = '' + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + ''; + + configureFlags = '' + --with-linux=${kernel}/lib/modules/${kernel.version}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build + --with-spl=${spl}/libexec/spl/${kernel.version} + ''; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.cddl; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/os-specific/linux/zfs/kerneldir_path.patch b/pkgs/os-specific/linux/zfs/kerneldir_path.patch new file mode 100644 index 00000000000..7deda946821 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/kerneldir_path.patch @@ -0,0 +1,140 @@ +diff -rc zfs-0.6.0-rc10.old/Makefile.in zfs-0.6.0-rc10/Makefile.in +*** zfs-0.6.0-rc10.old/Makefile.in Tue Aug 14 12:35:34 2012 +--- zfs-0.6.0-rc10/Makefile.in Fri Aug 17 15:21:18 2012 +*************** +*** 1121,1127 **** + + @CONFIG_KERNEL_TRUE@install-data-local: + @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ + @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + @CONFIG_KERNEL_TRUE@ done +--- 1121,1127 ---- + + @CONFIG_KERNEL_TRUE@install-data-local: + @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION); \ + @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + @CONFIG_KERNEL_TRUE@ done +diff -rc zfs-0.6.0-rc10.old/include/Makefile.in zfs-0.6.0-rc10/include/Makefile.in +*** zfs-0.6.0-rc10.old/include/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/Makefile.in Fri Aug 17 15:20:50 2012 +*************** +*** 402,408 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 402,408 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION) + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/linux/Makefile.in zfs-0.6.0-rc10/include/linux/Makefile.in +*** zfs-0.6.0-rc10.old/include/linux/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/linux/Makefile.in Fri Aug 17 15:20:53 2012 +*************** +*** 337,343 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 337,343 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/linux + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +diff -rc zfs-0.6.0-rc10.old/include/sys/Makefile.in zfs-0.6.0-rc10/include/sys/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/Makefile.in Fri Aug 17 15:20:57 2012 +*************** +*** 590,596 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 590,596 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in zfs-0.6.0-rc10/include/sys/fm/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fm/Makefile.in Fri Aug 17 15:21:00 2012 +*************** +*** 374,380 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 374,380 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in Fri Aug 17 15:21:03 2012 +*************** +*** 332,338 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 332,338 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +diff -rc zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fs/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fs/Makefile.in Fri Aug 17 15:21:06 2012 +*************** +*** 332,338 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 332,338 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + diff --git a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch new file mode 100644 index 00000000000..07cd04d1dde --- /dev/null +++ b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch @@ -0,0 +1,70 @@ +*** 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: + diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch new file mode 100644 index 00000000000..94710c5c985 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch @@ -0,0 +1,24 @@ +*** zfs-0.6.0-rc4.old/cmd/mount_zfs/Makefile.in Thu May 5 15:12:25 2011 +--- zfs-0.6.0-rc4/cmd/mount_zfs/Makefile.in Fri Jun 3 16:42:41 2011 +*************** +*** 285,296 **** + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +! +! # +! # Ignore the prefix for the mount helper. It must be installed in /sbin/ +! # because this path is hardcoded in the mount(8) for security reasons. +! # +! sbindir = /sbin + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ +--- 285,291 ---- + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +! sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ diff --git a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch new file mode 100644 index 00000000000..e223e34c3a4 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch @@ -0,0 +1,25 @@ +*** 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" \ diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix new file mode 100644 index 00000000000..1cc923f39d1 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/zfs.git; + rev = "3613204cd7e3ab1ae658"; + sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; + + buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; + + configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c0647c60f5..391ebadc6fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5964,6 +5964,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + spl = callPackage ../os-specific/linux/spl/default.nix { }; + sysprof = callPackage ../development/tools/profiling/sysprof { inherit (gnome) libglade; }; @@ -5983,6 +5985,8 @@ let }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; + + zfs = callPackage ../os-specific/linux/zfs/default.nix { }; }; # Build the kernel modules for the some of the kernels. From 65d3ef369e6657cc04dc1d9ac6d9837092b617aa Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 00:12:15 -0700 Subject: [PATCH 04/51] - remove old versions --- pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 ------------------------ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 ----------------------- 2 files changed, 47 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix delete mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix deleted file mode 100644 index c174daad26b..00000000000 --- a/pkgs/os-specific/linux/spl/spl-0.6.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, perl }: - -stdenv.mkDerivation { - name = "spl-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/spl.git; - rev = "dde6b7b137f56894a457"; - sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; - }; - - patches = [ ./install_prefix.patch ./module_prefix.patch ]; - - buildInputs = [ perl kernel linuxHeaders ]; - - configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" - "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix deleted file mode 100644 index 1cc923f39d1..00000000000 --- a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: - -stdenv.mkDerivation { - name = "zfs-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/zfs.git; - rev = "3613204cd7e3ab1ae658"; - sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; - }; - - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; - - buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; - - configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; - - meta = { - description = "Native ZFS for Linux"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} From 80433442665e52a90663ba9a8f22f6247b689c36 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:07:11 -0700 Subject: [PATCH 05/51] Revert " - remove old versions" This reverts commit 65d3ef369e6657cc04dc1d9ac6d9837092b617aa. --- pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 ++++++++++++++++++++++++ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 +++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix create mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix new file mode 100644 index 00000000000..c174daad26b --- /dev/null +++ b/pkgs/os-specific/linux/spl/spl-0.6.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, perl }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/spl.git; + rev = "dde6b7b137f56894a457"; + sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; + }; + + patches = [ ./install_prefix.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel linuxHeaders ]; + + configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" + "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix new file mode 100644 index 00000000000..1cc923f39d1 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/zfs.git; + rev = "3613204cd7e3ab1ae658"; + sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; + + buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; + + configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} From ccad09d3b9b80b41fd79b673ebede73444a9829c Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:07:33 -0700 Subject: [PATCH 06/51] Revert " - zfs-0.6.0-rc11, and spl-0.6.0-rc11" This reverts commit 8eb9491a22cd57415ba10470b7c7950e712ec4c0. --- pkgs/lib/licenses.nix | 6 - pkgs/os-specific/linux/spl/default.nix | 39 ----- .../linux/spl/install_prefix.patch | 19 --- .../linux/spl/install_prefix_2.patch | 32 ---- .../os-specific/linux/spl/module_prefix.patch | 33 ----- pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 --- pkgs/os-specific/linux/zfs/default.nix | 34 ----- .../linux/zfs/kerneldir_path.patch | 140 ------------------ .../linux/zfs/module_perm_prefix.patch | 70 --------- .../linux/zfs/mount_zfs_prefix.patch | 24 --- .../zfs/no_absolute_paths_to_coreutils.patch | 25 ---- pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 --- pkgs/top-level/all-packages.nix | 4 - 13 files changed, 473 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/default.nix delete mode 100644 pkgs/os-specific/linux/spl/install_prefix.patch delete mode 100644 pkgs/os-specific/linux/spl/install_prefix_2.patch delete mode 100644 pkgs/os-specific/linux/spl/module_prefix.patch delete mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix delete mode 100644 pkgs/os-specific/linux/zfs/default.nix delete mode 100644 pkgs/os-specific/linux/zfs/kerneldir_path.patch delete mode 100644 pkgs/os-specific/linux/zfs/module_perm_prefix.patch delete mode 100644 pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch delete mode 100644 pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch delete mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index e1743bddf69..87f9298706e 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -34,12 +34,6 @@ url = https://fedoraproject.org/wiki/Licensing/BSD; }; - cddl = { - shortName = "CDDL"; - fullName = "Common Development Distribution License "; - url = http://www.opensolaris.org/os/licensing/cddllicense.txt; - }; - cpl10 = { shortName = "CPL 1.0"; fullName = "Common Public License version 1.0"; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix deleted file mode 100644 index 96565fffa0e..00000000000 --- a/pkgs/os-specific/linux/spl/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: - -stdenv.mkDerivation { - name = "spl-0.6.0-rc11"; - src = fetchurl { - url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc11.tar.gz; - sha256 = "0brsrr9hvzlpx7a26nn8rw9k2kh9s75hmxp6h087hi64hzxysf8g"; - }; - - patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; - - buildInputs = [ perl kernel autoconf automake libtool ]; - - NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; - - preConfigure = '' - ./autogen.sh - - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - 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" - ''; - - configureFlags = '' - --with-linux=${kernel}/lib/modules/${kernel.version}/build - --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build - ''; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - homepage = http://zfsonlinux.org/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.cddl; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - }; -} diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch deleted file mode 100644 index 9a7393b7170..00000000000 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** 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 -*************** -*** 32,38 **** - 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 ---- - 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; \ - done diff --git a/pkgs/os-specific/linux/spl/install_prefix_2.patch b/pkgs/os-specific/linux/spl/install_prefix_2.patch deleted file mode 100644 index 6068ad1d69c..00000000000 --- a/pkgs/os-specific/linux/spl/install_prefix_2.patch +++ /dev/null @@ -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 diff --git a/pkgs/os-specific/linux/spl/module_prefix.patch b/pkgs/os-specific/linux/spl/module_prefix.patch deleted file mode 100644 index dd40711ccdb..00000000000 --- a/pkgs/os-specific/linux/spl/module_prefix.patch +++ /dev/null @@ -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 diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix deleted file mode 100644 index c174daad26b..00000000000 --- a/pkgs/os-specific/linux/spl/spl-0.6.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, perl }: - -stdenv.mkDerivation { - name = "spl-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/spl.git; - rev = "dde6b7b137f56894a457"; - sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; - }; - - patches = [ ./install_prefix.patch ./module_prefix.patch ]; - - buildInputs = [ perl kernel linuxHeaders ]; - - configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" - "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix deleted file mode 100644 index 43e7b2fd95d..00000000000 --- a/pkgs/os-specific/linux/zfs/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, kernel, spl, perl, zlib, libuuid, coreutils, utillinux }: - -stdenv.mkDerivation { - name = "zfs-0.6.0-rc11"; - src = fetchurl { - url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz; - sha256 = "0wx0srn2k31j9xdk3nvk7l847r0diyb7ph6hd006ax9l5p9zj0a7"; - }; - - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; - - buildInputs = [ kernel spl perl zlib libuuid coreutils ]; - - NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; - - preConfigure = '' - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" - ''; - - configureFlags = '' - --with-linux=${kernel}/lib/modules/${kernel.version}/build - --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build - --with-spl=${spl}/libexec/spl/${kernel.version} - ''; - - meta = { - description = "Native ZFS for Linux"; - homepage = http://zfsonlinux.org/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.cddl; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - }; -} diff --git a/pkgs/os-specific/linux/zfs/kerneldir_path.patch b/pkgs/os-specific/linux/zfs/kerneldir_path.patch deleted file mode 100644 index 7deda946821..00000000000 --- a/pkgs/os-specific/linux/zfs/kerneldir_path.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -rc zfs-0.6.0-rc10.old/Makefile.in zfs-0.6.0-rc10/Makefile.in -*** zfs-0.6.0-rc10.old/Makefile.in Tue Aug 14 12:35:34 2012 ---- zfs-0.6.0-rc10/Makefile.in Fri Aug 17 15:21:18 2012 -*************** -*** 1121,1127 **** - - @CONFIG_KERNEL_TRUE@install-data-local: - @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ -! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ - @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - @CONFIG_KERNEL_TRUE@ done ---- 1121,1127 ---- - - @CONFIG_KERNEL_TRUE@install-data-local: - @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ -! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION); \ - @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - @CONFIG_KERNEL_TRUE@ done -diff -rc zfs-0.6.0-rc10.old/include/Makefile.in zfs-0.6.0-rc10/include/Makefile.in -*** zfs-0.6.0-rc10.old/include/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/Makefile.in Fri Aug 17 15:20:50 2012 -*************** -*** 402,408 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - ---- 402,408 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION) - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - -diff -rc zfs-0.6.0-rc10.old/include/linux/Makefile.in zfs-0.6.0-rc10/include/linux/Makefile.in -*** zfs-0.6.0-rc10.old/include/linux/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/linux/Makefile.in Fri Aug 17 15:20:53 2012 -*************** -*** 337,343 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - ---- 337,343 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/linux - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - -diff -rc zfs-0.6.0-rc10.old/include/sys/Makefile.in zfs-0.6.0-rc10/include/sys/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/Makefile.in Fri Aug 17 15:20:57 2012 -*************** -*** 590,596 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - ---- 590,596 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - -diff -rc zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in zfs-0.6.0-rc10/include/sys/fm/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/fm/Makefile.in Fri Aug 17 15:21:00 2012 -*************** -*** 374,380 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - ---- 374,380 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - -diff -rc zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in Fri Aug 17 15:21:03 2012 -*************** -*** 332,338 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - ---- 332,338 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - -diff -rc zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fs/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/fs/Makefile.in Fri Aug 17 15:21:06 2012 -*************** -*** 332,338 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - ---- 332,338 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - diff --git a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch deleted file mode 100644 index 07cd04d1dde..00000000000 --- a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch +++ /dev/null @@ -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: - diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch deleted file mode 100644 index 94710c5c985..00000000000 --- a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch +++ /dev/null @@ -1,24 +0,0 @@ -*** zfs-0.6.0-rc4.old/cmd/mount_zfs/Makefile.in Thu May 5 15:12:25 2011 ---- zfs-0.6.0-rc4/cmd/mount_zfs/Makefile.in Fri Jun 3 16:42:41 2011 -*************** -*** 285,296 **** - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ -! -! # -! # Ignore the prefix for the mount helper. It must be installed in /sbin/ -! # because this path is hardcoded in the mount(8) for security reasons. -! # -! sbindir = /sbin - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ ---- 285,291 ---- - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ -! sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ diff --git a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch deleted file mode 100644 index e223e34c3a4..00000000000 --- a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch +++ /dev/null @@ -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" \ diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix deleted file mode 100644 index 1cc923f39d1..00000000000 --- a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: - -stdenv.mkDerivation { - name = "zfs-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/zfs.git; - rev = "3613204cd7e3ab1ae658"; - sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; - }; - - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; - - buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; - - configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; - - meta = { - description = "Native ZFS for Linux"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 391ebadc6fa..0c0647c60f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5964,8 +5964,6 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; - spl = callPackage ../os-specific/linux/spl/default.nix { }; - sysprof = callPackage ../development/tools/profiling/sysprof { inherit (gnome) libglade; }; @@ -5985,8 +5983,6 @@ let }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - - zfs = callPackage ../os-specific/linux/zfs/default.nix { }; }; # Build the kernel modules for the some of the kernels. From e7f3ff803e15e7a65e4bcc0dec300e3b02233cfd Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:11:25 -0700 Subject: [PATCH 07/51] - zfs 0.6.0-rc11, spl 0.6.0-rc11 --- pkgs/lib/licenses.nix | 6 + pkgs/os-specific/linux/spl/default.nix | 39 +++++ .../linux/spl/install_prefix.patch | 19 +++ .../linux/spl/install_prefix_2.patch | 32 ++++ .../os-specific/linux/spl/module_prefix.patch | 33 +++++ pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 +++ pkgs/os-specific/linux/zfs/default.nix | 34 +++++ .../linux/zfs/kerneldir_path.patch | 140 ++++++++++++++++++ .../linux/zfs/module_perm_prefix.patch | 70 +++++++++ .../linux/zfs/mount_zfs_prefix.patch | 24 +++ .../zfs/no_absolute_paths_to_coreutils.patch | 25 ++++ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 +++ pkgs/top-level/all-packages.nix | 4 + 13 files changed, 473 insertions(+) create mode 100644 pkgs/os-specific/linux/spl/default.nix create mode 100644 pkgs/os-specific/linux/spl/install_prefix.patch create mode 100644 pkgs/os-specific/linux/spl/install_prefix_2.patch create mode 100644 pkgs/os-specific/linux/spl/module_prefix.patch create mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix create mode 100644 pkgs/os-specific/linux/zfs/default.nix create mode 100644 pkgs/os-specific/linux/zfs/kerneldir_path.patch create mode 100644 pkgs/os-specific/linux/zfs/module_perm_prefix.patch create mode 100644 pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch create mode 100644 pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch create mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 87f9298706e..e1743bddf69 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -34,6 +34,12 @@ url = https://fedoraproject.org/wiki/Licensing/BSD; }; + cddl = { + shortName = "CDDL"; + fullName = "Common Development Distribution License "; + url = http://www.opensolaris.org/os/licensing/cddllicense.txt; + }; + cpl10 = { shortName = "CPL 1.0"; fullName = "Common Public License version 1.0"; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix new file mode 100644 index 00000000000..96565fffa0e --- /dev/null +++ b/pkgs/os-specific/linux/spl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc11"; + src = fetchurl { + url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc11.tar.gz; + sha256 = "0brsrr9hvzlpx7a26nn8rw9k2kh9s75hmxp6h087hi64hzxysf8g"; + }; + + patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel autoconf automake libtool ]; + + NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + + preConfigure = '' + ./autogen.sh + + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + 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" + ''; + + configureFlags = '' + --with-linux=${kernel}/lib/modules/${kernel.version}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build + ''; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.cddl; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch new file mode 100644 index 00000000000..9a7393b7170 --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -0,0 +1,19 @@ +*** 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 +*************** +*** 32,38 **** + 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 ---- + 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; \ + done diff --git a/pkgs/os-specific/linux/spl/install_prefix_2.patch b/pkgs/os-specific/linux/spl/install_prefix_2.patch new file mode 100644 index 00000000000..6068ad1d69c --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix_2.patch @@ -0,0 +1,32 @@ +*** 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 diff --git a/pkgs/os-specific/linux/spl/module_prefix.patch b/pkgs/os-specific/linux/spl/module_prefix.patch new file mode 100644 index 00000000000..dd40711ccdb --- /dev/null +++ b/pkgs/os-specific/linux/spl/module_prefix.patch @@ -0,0 +1,33 @@ +*** 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 diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix new file mode 100644 index 00000000000..c174daad26b --- /dev/null +++ b/pkgs/os-specific/linux/spl/spl-0.6.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, perl }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/spl.git; + rev = "dde6b7b137f56894a457"; + sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; + }; + + patches = [ ./install_prefix.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel linuxHeaders ]; + + configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" + "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix new file mode 100644 index 00000000000..43e7b2fd95d --- /dev/null +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, kernel, spl, perl, zlib, libuuid, coreutils, utillinux }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc11"; + src = fetchurl { + url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz; + sha256 = "0wx0srn2k31j9xdk3nvk7l847r0diyb7ph6hd006ax9l5p9zj0a7"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; + + buildInputs = [ kernel spl perl zlib libuuid coreutils ]; + + NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + + preConfigure = '' + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + ''; + + configureFlags = '' + --with-linux=${kernel}/lib/modules/${kernel.version}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build + --with-spl=${spl}/libexec/spl/${kernel.version} + ''; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.cddl; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/os-specific/linux/zfs/kerneldir_path.patch b/pkgs/os-specific/linux/zfs/kerneldir_path.patch new file mode 100644 index 00000000000..7deda946821 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/kerneldir_path.patch @@ -0,0 +1,140 @@ +diff -rc zfs-0.6.0-rc10.old/Makefile.in zfs-0.6.0-rc10/Makefile.in +*** zfs-0.6.0-rc10.old/Makefile.in Tue Aug 14 12:35:34 2012 +--- zfs-0.6.0-rc10/Makefile.in Fri Aug 17 15:21:18 2012 +*************** +*** 1121,1127 **** + + @CONFIG_KERNEL_TRUE@install-data-local: + @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ + @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + @CONFIG_KERNEL_TRUE@ done +--- 1121,1127 ---- + + @CONFIG_KERNEL_TRUE@install-data-local: + @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION); \ + @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + @CONFIG_KERNEL_TRUE@ done +diff -rc zfs-0.6.0-rc10.old/include/Makefile.in zfs-0.6.0-rc10/include/Makefile.in +*** zfs-0.6.0-rc10.old/include/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/Makefile.in Fri Aug 17 15:20:50 2012 +*************** +*** 402,408 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 402,408 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION) + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/linux/Makefile.in zfs-0.6.0-rc10/include/linux/Makefile.in +*** zfs-0.6.0-rc10.old/include/linux/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/linux/Makefile.in Fri Aug 17 15:20:53 2012 +*************** +*** 337,343 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 337,343 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/linux + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +diff -rc zfs-0.6.0-rc10.old/include/sys/Makefile.in zfs-0.6.0-rc10/include/sys/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/Makefile.in Fri Aug 17 15:20:57 2012 +*************** +*** 590,596 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 590,596 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in zfs-0.6.0-rc10/include/sys/fm/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fm/Makefile.in Fri Aug 17 15:21:00 2012 +*************** +*** 374,380 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 374,380 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in Fri Aug 17 15:21:03 2012 +*************** +*** 332,338 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 332,338 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +diff -rc zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fs/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fs/Makefile.in Fri Aug 17 15:21:06 2012 +*************** +*** 332,338 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 332,338 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + diff --git a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch new file mode 100644 index 00000000000..07cd04d1dde --- /dev/null +++ b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch @@ -0,0 +1,70 @@ +*** 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: + diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch new file mode 100644 index 00000000000..94710c5c985 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch @@ -0,0 +1,24 @@ +*** zfs-0.6.0-rc4.old/cmd/mount_zfs/Makefile.in Thu May 5 15:12:25 2011 +--- zfs-0.6.0-rc4/cmd/mount_zfs/Makefile.in Fri Jun 3 16:42:41 2011 +*************** +*** 285,296 **** + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +! +! # +! # Ignore the prefix for the mount helper. It must be installed in /sbin/ +! # because this path is hardcoded in the mount(8) for security reasons. +! # +! sbindir = /sbin + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ +--- 285,291 ---- + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +! sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ diff --git a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch new file mode 100644 index 00000000000..e223e34c3a4 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch @@ -0,0 +1,25 @@ +*** 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" \ diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix new file mode 100644 index 00000000000..1cc923f39d1 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/zfs.git; + rev = "3613204cd7e3ab1ae658"; + sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; + + buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; + + configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c0647c60f5..391ebadc6fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5964,6 +5964,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + spl = callPackage ../os-specific/linux/spl/default.nix { }; + sysprof = callPackage ../development/tools/profiling/sysprof { inherit (gnome) libglade; }; @@ -5983,6 +5985,8 @@ let }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; + + zfs = callPackage ../os-specific/linux/zfs/default.nix { }; }; # Build the kernel modules for the some of the kernels. From 18d4a832b053067eb771d3f19e4116069c150033 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:36:36 -0700 Subject: [PATCH 08/51] - clean up openttd, rili, uqm, and widelands descriptions --- pkgs/games/openttd/default.nix | 10 ++++++++++ pkgs/games/rili/default.nix | 7 ++++++- pkgs/games/uqm/default.nix | 8 +++++++- pkgs/games/widelands/default.nix | 6 ++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 70b03a4e483..616adf00224 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -25,6 +25,16 @@ stdenv.mkDerivation rec { meta = { description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".''; + longDescription = '' + OpenTTD is a transportation economics simulator. In single player mode, + players controll a transportation business, and use rail, road, sea, and air + transport to move goods and people around the simulated world. + + In multiplayer networked mode, players may: + - play competitively as different businesses + - play cooperatively controling the same business + - observe as spectators + ''; homepage = http://www.openttd.org/; license = "GPLv2"; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index b3563f42341..84bcf5efa7c 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -19,7 +19,12 @@ stdenv.mkDerivation { meta = { homepage = http://ri-li.sourceforge.net; license = "GPL2+"; - description = "Ri-li is an arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches to win."; + description = "A children's train game"; + longDescription = '' + Ri-li is an arcade game licensed under the GPL (General Public License). +You drive a toy wood engine in many levels and you must collect all the coaches +to win. + ''; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index fd6d727e734..6e67ce660f1 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -64,7 +64,13 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''Urquan Masters is an open source clone of the Classic top-down space battle Star Cotnrol ''; + description = "Remake of Star Control II"; + longDescription = '' + The goals for the The Ur-Quan Masters project are: + - to bring Star Control II to modern platforms, thereby making a lot of people happy + - to make game translations easy, thereby making even more people happy + - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! + ''; homepage = http://sc2.sourceforge.net/; license = "GPLv2"; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 62ec56b2f7a..45538acdca3 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -53,6 +53,12 @@ rec { meta = { description = "Widelands RTS with multiple-goods economy"; + longDescription = '' + Widelands is a real time strategy game based on "The Settlers" and "The + Settlers II". It has a single player campaign mode, as well as a networked + multiplayer mode. + ''; + maintainers = with a.lib.maintainers; [ raskin From e23bda977de2cbf78240c2c54e07fb9a0830598a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:40:26 -0700 Subject: [PATCH 09/51] - removing old spl/zfs versions --- pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 ------------------------ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 ----------------------- 2 files changed, 47 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix delete mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix deleted file mode 100644 index c174daad26b..00000000000 --- a/pkgs/os-specific/linux/spl/spl-0.6.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, perl }: - -stdenv.mkDerivation { - name = "spl-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/spl.git; - rev = "dde6b7b137f56894a457"; - sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; - }; - - patches = [ ./install_prefix.patch ./module_prefix.patch ]; - - buildInputs = [ perl kernel linuxHeaders ]; - - configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" - "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix deleted file mode 100644 index 1cc923f39d1..00000000000 --- a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: - -stdenv.mkDerivation { - name = "zfs-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/zfs.git; - rev = "3613204cd7e3ab1ae658"; - sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; - }; - - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; - - buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; - - configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; - - meta = { - description = "Native ZFS for Linux"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} From 91d58edafc012223bcd86c4fa45231f7f3291a8a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 13:52:54 -0700 Subject: [PATCH 10/51] - Make rili work with new autoconf versions --- pkgs/games/rili/default.nix | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 84bcf5efa7c..9d5764a6307 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -1,30 +1 @@ -{stdenv, fetchurl, SDL_mixer, SDL, autoconf, automake}: - -stdenv.mkDerivation { - name = "ri_li-2.0.1"; - - src = fetchurl { - url = mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2; - sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd"; - }; - - patches = [ ./moderinze_cpp.patch ]; - - preConfigure = '' - export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include" - ''; - - buildInputs = [SDL SDL_mixer autoconf automake]; - - meta = { - homepage = http://ri-li.sourceforge.net; - license = "GPL2+"; - description = "A children's train game"; - longDescription = '' - Ri-li is an arcade game licensed under the GPL (General Public License). -You drive a toy wood engine in many levels and you must collect all the coaches -to win. - ''; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - }; -} +import ./pkgs/top-level/all-packages.nix From 66e43a52972dca165433860ba3734c6a2bfeb42b Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 13:56:51 -0700 Subject: [PATCH 11/51] - Make rili work with new autoconf versions --- pkgs/games/rili/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 84bcf5efa7c..934213279fa 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { preConfigure = '' export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include" + autoreconf -i ''; buildInputs = [SDL SDL_mixer autoconf automake]; From f2e82a385e1e4cb508de1010673765d9aac0c3e9 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sun, 7 Oct 2012 17:52:43 +0200 Subject: [PATCH 12/51] Add jhc 0.8.0 --- pkgs/development/compilers/jhc/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/compilers/jhc/default.nix diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix new file mode 100644 index 00000000000..4b4d85df890 --- /dev/null +++ b/pkgs/development/compilers/jhc/default.nix @@ -0,0 +1,29 @@ +{ + stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl, + regexCompat, HsSyck, random +}: + +stdenv.mkDerivation rec { + + name = "jhc-${version}"; + + version = "0.8.0"; + + src = fetchurl { + url = "http://repetae.net/dist/${name}.tar.gz"; + sha256 = "0rbv0gpp7glhd9xqy7snbiaiizwnsfg9vzhvyywcvbmb35yivy2a"; + }; + + buildInputs = [ + perl ghc binary zlib utf8String readline fgl regexCompat HsSyck random + ]; + + meta = { + description = '' + A Haskell compiler which aims to produce the most efficient programs + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.aforemny ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e45b644203..c3f78360e11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2280,6 +2280,11 @@ let }; }; + jhc = callPackage ../development/compilers/jhc { + inherit (haskellPackages_ghc6123) ghc binary zlib utf8String readline fgl + regexCompat HsSyck random; + }; + # Haskell and GHC # Import Haskell infrastructure. From abf60bdb08e509dda5e95ce13f606e7586dacdfc Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 9 Oct 2012 23:18:50 -0700 Subject: [PATCH 13/51] Upgrade firmware-linux-nonfree to 0.36, because the last version disappeared from the Debian mirrors. --- .../firmware-linux-nonfree/default.nix | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index e2ba47abb9a..f6173fcf5f5 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -6,25 +6,26 @@ { stdenv, fetchurl, buildEnv, dpkg }: let - version = "0.35"; + version = "0.36"; + packages = [ - { name = "linux-nonfree"; sha256 = "8c0701500e5252e3e05ad0e5403cc5295899ccb2d6d731380b5f4c2d90003ed1"; } - { name = "atheros"; sha256 = "df411d76e3d55cb256b0974df16cf18f316c1325f33670fbc9e36abba5aa46c0"; } - { name = "bnx2"; sha256 = "124e74aa6ce477f7b6a0b5eff3870b0104fd885b4bdfb9977175e75bdb9a7525"; } - { name = "bnx2x"; sha256 = "4cbcf3422a9aaa6e31704770c724179765dceabd2e6867e24cf47039925e6545"; } - { name = "brcm80211"; sha256 = "eefba7ba31c018d514ea15878cfd7bca36a65b0df3e9024fc3875a990678a684"; } - { name = "intelwimax"; sha256 = "436a3bd128224f43988630318aa3e74abfbe838916e1e10a602ddc468b75d843"; } - { name = "ipw2x00"; sha256 = "9c214e3a9f7f7d710b5cb30282d5ca2b2ccafc3bb208dfe7e18de16d3aadc7a3"; } - { name = "ivtv"; sha256 = "ced47d8b87ff8ff70a8c32492cc4fb5818860ef018b5c04a4415ab26c9b16300"; } - { name = "iwlwifi"; sha256 = "5d9615ec128b59cc5834e0261ea74127c0bc64bafabdaef1028a8f1acf611568"; } - { name = "libertas"; sha256 = "b109fb5c392928ac5495f8ce1d0f41d123b193031f8b548e8b68e9563db37016"; } - { name = "linux"; sha256 = "8e87f75c120904f2ca5fd9017e4503c23d8705b9ccaeb570374d1747163620ab"; } - { name = "myricom"; sha256 = "4c9e19d8b2cea97eb05f9d577537dba81aa36ac06c6da9bbed0bfa20434b7acc"; } - { name = "netxen"; sha256 = "3bd129229cf548a533c79cb55deefa7e4919e09fcc1f655773f4fa5078d81b9b"; } - { name = "qlogic"; sha256 = "213d098435c657115d2754ef5ead52e64f5fa05be4dcbcb0d5d3ca745376959c"; } - { name = "ralink"; sha256 = "51f3001ed15ca72bb088297b9e6e4a821ba6250f0ccc8886d77d2f5386a21836"; } - { name = "realtek"; sha256 = "a6338f5cd8bbe9627fa994016ebb0a91b40914021bec280ddc8f8a56eab22287"; } + { name = "linux-nonfree"; sha256 = "668d262dfcf18ffef2fe2a0b853b81bf5855f49fd2133203cbda097b1507c953"; } + { name = "atheros"; sha256 = "27cbd2099ce28c742f42833b09a61bdc7fb5b2ebcf5b35a52e750160ea1001b6"; } + { name = "bnx2"; sha256 = "32730fdeb0fb15a36e0ca046bde69e1a6fece8561af57afc7d9f1cf978fd25ab"; } + { name = "bnx2x"; sha256 = "22f23f4abb4aa2dac22718f12cf3bbd3fd2d63870b13e81c8401e6f841a719e8"; } + { name = "brcm80211"; sha256 = "17055c4199cc7e2aaa7d1d76dd5e718d24dbebb84020bb2d95ffab03bcfc7e8a"; } + { name = "intelwimax"; sha256 = "cc1b894990d3074e93b3f79b2b617614aab554b5e832d34993b5a16f64bdb84a"; } + { name = "ipw2x00"; sha256 = "2ef0810e2e037f7d536b24cc35527c456ff13b7aa5fd2df607b7035227553c9d"; } + { name = "ivtv"; sha256 = "7bf30e142679d53ad376002f29026bbe28de51e1cb71bcc3ec5c5f5f119a7118"; } + { name = "iwlwifi"; sha256 = "46ce0915583674ec10bfde3840b66ff450237edf604804ff51b9872fe767c1bb"; } + { name = "libertas"; sha256 = "c5d370d244f1c3a42f0a0280ed0cab067dbf36fa2926d387c9d10cf4ccd1b000"; } + { name = "linux"; sha256 = "e19bedc2cacf2cd7a1fc38e25820effe9e58fdc56608e9f7c320c85b80cba6ea"; } + { name = "myricom"; sha256 = "038bd618c00e852206a8a1443ba47ea644c04052bd8f10af9392c716ebf16b3c"; } + { name = "netxen"; sha256 = "29e3c1707dab6439f391318a223e5d4b6508d493c8d8bad799aef4f35b4704e7"; } + { name = "qlogic"; sha256 = "cc43c6016f2b7661d39e1d678ac0e8ca70081be8a0c76c2ec4d2e71493afa7d8"; } + { name = "ralink"; sha256 = "4db8dc6b98821c59f008c8bf7464317443b031cebf6d7e56c06f0824e69e3922"; } + { name = "realtek"; sha256 = "c39e65e5a589325ceb365d11b9ea10b0244134b7e5b3b05fd91fe6ad66b2f093"; } ]; fetchPackage = From 537fa309b5ddcd1591e5d7729a34d213f2780d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 10 Oct 2012 23:17:35 +0200 Subject: [PATCH 14/51] Remove phat Phat was only used by Specimen, which has been replaced by Petri-Foo. Petri-Foo dropped the dependency on Phat, so it is no longer being used at all, and it also fails to build. --- pkgs/development/libraries/phat/default.nix | 21 --------------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/libraries/phat/default.nix diff --git a/pkgs/development/libraries/phat/default.nix b/pkgs/development/libraries/phat/default.nix deleted file mode 100644 index 6e68e3d9da8..00000000000 --- a/pkgs/development/libraries/phat/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, gtk, libgnomecanvas, pkgconfig }: - -stdenv.mkDerivation rec { - name = "phat-${version}"; - version = "0.4.1"; - - src = fetchurl { - url = "http://download.berlios.de/phat/${name}.tar.gz"; - sha256 = "1icncp2d8hbarzz8mmflkw13blg7blgwfic8q2wll7s6n01ii2av"; - }; - - buildInputs = [ gtk libgnomecanvas pkgconfig ]; - - meta = with stdenv.lib; { - description = "GTK+ widgets geared toward pro-audio apps"; - homepage = http://phat.berlios.de; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1befce29415..dd60798ec97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6124,10 +6124,6 @@ let config = config.pcmciaUtils.config or null; }; - phat = callPackage ../development/libraries/phat { - inherit (gnome) libgnomecanvas; - }; - pmount = callPackage ../os-specific/linux/pmount { }; pmutils = callPackage ../os-specific/linux/pm-utils { }; From bc4d201478bce1ef125536a946ab7b2bee40f6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 11 Oct 2012 01:23:10 +0200 Subject: [PATCH 15/51] distrho: fix HybridReverb2 --- pkgs/applications/audio/distrho/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index b51c97a6d68..7a1d24844b6 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { patchPhase = '' sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile + sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \ + -i ports/hybridreverb2/source/SystemConfig.cpp + sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf ''; buildInputs = [ @@ -38,6 +41,12 @@ stdenv.mkDerivation rec { cp bin/standalone/* $out/bin/ mkdir -p $out/lib/lv2 cp -a bin/lv2/* $out/lib/lv2/ + + # HybridReverb2 data + mkdir -p $out/etc/HybridReverb2 + cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/ + mkdir -p $out/share + cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/ ''; meta = with stdenv.lib; { From ebd2b0e1ab5f9b7eff598ec3784bef2be7efddff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Oct 2012 21:51:19 -0400 Subject: [PATCH 16/51] linux: Update to 3.2.31 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 2f36792d353..47048509905 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.30"; + version = "3.2.31"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1yg353alkk7vddd8b2d7dlgpwaxjigk8i9qq1xifln3i842zinvw"; + sha256 = "0b2yklmgxv1sk847701f1wgh2kg2jxqqp7bg1279p7fj8vnmbmrq"; }; config = configWithPlatform stdenv.platform; From 7b40d67d618ab80200380d8c219bae519c289155 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 11 Oct 2012 06:11:49 +0200 Subject: [PATCH 17/51] adding taskwarrior --- pkgs/tools/misc/task/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/task/default.nix diff --git a/pkgs/tools/misc/task/default.nix b/pkgs/tools/misc/task/default.nix new file mode 100644 index 00000000000..529eacd377e --- /dev/null +++ b/pkgs/tools/misc/task/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, cmake}: + +stdenv.mkDerivation { + name = "task-2.1.2"; + + enableParallelBuilding = true; + + src = fetchurl { + url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz; + sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg"; + }; + + buildInputs = [ cmake ]; + + meta = { + description = "GTD (getting things done) implementation"; + homepage = http://taskwarrior.org; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 504e6452394..1b9eca5e07c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1525,6 +1525,8 @@ let autoconf = autoconf213; }; + task = callPackage ../tools/misc/task { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; /* From 0bf1789b6a64f8654325412de2a1a40c7834f6ba Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Oct 2012 10:50:53 +0400 Subject: [PATCH 18/51] Use newly-added taskwarrior as an update to existing taskwarrior attribute --- .../applications/misc/taskwarrior/default.nix | 35 ++++++++----------- pkgs/tools/misc/task/default.nix | 22 ------------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 14 insertions(+), 45 deletions(-) delete mode 100644 pkgs/tools/misc/task/default.nix diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 95f9de2f42b..dbb3c3f6a4e 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,29 +1,22 @@ -{ stdenv, fetchurl, cmake, lua5 }: +{stdenv, fetchurl, cmake}: stdenv.mkDerivation { - name = "task-warrior-2.0.0"; - - src = fetchurl { - url = http://www.taskwarrior.org/download/task-2.0.0.tar.gz; - sha256 = "1gbmcynj2n2c9dcykxn27ffk034mvm0zri5hqhfdx593dhv1x5vq"; - }; - - NIX_LDFLAGS = "-ldl"; - - buildNativeInputs = [ cmake ]; - buildInputs = [ lua5 ]; - - crossAttrs = { - preConfigure = '' - export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl" - ''; - }; + name = "taskwarrior-2.1.2"; enableParallelBuilding = true; + src = fetchurl { + url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz; + sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg"; + }; + + buildInputs = [ cmake ]; + meta = { - description = "Command-line todo list manager"; - homepage = http://taskwarrior.org/; - license = "GPLv2+"; + description = "GTD (getting things done) implementation"; + homepage = http://taskwarrior.org; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/task/default.nix b/pkgs/tools/misc/task/default.nix deleted file mode 100644 index 529eacd377e..00000000000 --- a/pkgs/tools/misc/task/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, cmake}: - -stdenv.mkDerivation { - name = "task-2.1.2"; - - enableParallelBuilding = true; - - src = fetchurl { - url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz; - sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg"; - }; - - buildInputs = [ cmake ]; - - meta = { - description = "GTD (getting things done) implementation"; - homepage = http://taskwarrior.org; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f855a2ab34..caedbfdb783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1525,8 +1525,6 @@ let autoconf = autoconf213; }; - task = callPackage ../tools/misc/task { }; - tcpdump = callPackage ../tools/networking/tcpdump { }; /* From 8e8143262b11396834371e133aee7b121652d7d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 09:53:33 +0200 Subject: [PATCH 19/51] haskell-primitive: add version 0.5.0.1 --- .../libraries/haskell/primitive/0.5.0.1.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/primitive/0.5.0.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix new file mode 100644 index 00000000000..af6778ccd14 --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.5.0.1"; + sha256 = "04s33xqxz68ddppig5pjf7ki1y5y62xzzzmg3b5pkcxp0r6rsv2j"; + meta = { + homepage = "http://code.haskell.org/primitive"; + description = "Primitive memory-related operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 96ff9d0960f..d6b2f4491c4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1292,7 +1292,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); primitive_0_4_1 = callPackage ../development/libraries/haskell/primitive/0.4.1.nix {}; primitive_0_5 = callPackage ../development/libraries/haskell/primitive/0.5.nix {}; - primitive = self.primitive_0_4_1; + primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; + primitive = self.primitive_0_5_0_1; processExtras = callPackage ../development/libraries/haskell/process-extras {}; From 5b2191bf2217816489ca2b50aac43f91e1215284 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 09:53:45 +0200 Subject: [PATCH 20/51] haskell-vector: add version 0.10.0.1 --- .../libraries/haskell/vector/0.10.0.1.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/vector/0.10.0.1.nix diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix new file mode 100644 index 00000000000..7acc89d6a91 --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq, primitive }: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.10.0.1"; + sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc"; + buildDepends = [ deepseq primitive ]; + meta = { + homepage = "http://code.haskell.org/vector"; + description = "Efficient Arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d6b2f4491c4..44bb7aef8c7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1635,8 +1635,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Vec = callPackage ../development/libraries/haskell/Vec {}; vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix {}; - vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {}; - vector = self.vector_0_9_1; + vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {}; + vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; + vector = self.vector_0_10_0_1; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; From 182c28ba4a7565d30942575d00047514e2b6bb2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:48 +0200 Subject: [PATCH 21/51] haskell-DSH: update to version 0.8.0.1 --- pkgs/development/libraries/haskell/DSH/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix index 3275db0e0d8..bb3e335eafa 100644 --- a/pkgs/development/libraries/haskell/DSH/default.nix +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -1,15 +1,10 @@ -{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl -, Pathfinder, syb, text, xhtml -}: +{ cabal, csv, FerryCore, HaXml, HDBC, mtl, Pathfinder, text }: cabal.mkDerivation (self: { pname = "DSH"; - version = "0.7.8.2"; - sha256 = "1rs42c05q4s46a1a03srzdq0aijwalhilzifc8ryq4qwjgh7vkwz"; - buildDepends = [ - convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text - xhtml - ]; + version = "0.8.0.1"; + sha256 = "08bwn7jpnkzvyj2dlpk6zx97iwsjb085vbnc8hwvxnhf9y8wl96s"; + buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ]; meta = { description = "Database Supported Haskell"; license = self.stdenv.lib.licenses.bsd3; From 101cc0bde5f9cf09b62caf35c2fe81de9b17c360 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:48 +0200 Subject: [PATCH 22/51] haskell-conduit: update to version 0.5.2.6 --- pkgs/development/libraries/haskell/conduit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index e1a5fc10a42..d5b45960cb9 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.5.2.5"; - sha256 = "1savaq8n29cry75jl8rfk35q24s5bvm57j1zhnp3dcvj2i6w9k3y"; + version = "0.5.2.6"; + sha256 = "0zmls6gl02mdwapdggw340s7pn5fjsvaky40m31ph3n28qr71kww"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; From 0d6432e26c3920005096e3ce7eb35c90b3b324c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:48 +0200 Subject: [PATCH 23/51] haskell-criterion: update to version 0.6.2.0 --- pkgs/development/libraries/haskell/criterion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 54b6b20dc83..64f03d4dcca 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "0.6.1.1"; - sha256 = "1w5yqcgnx2ij3hmvmz5g4ynj6n8wa3yyk1kfbbwxyh9j5kc2xwiw"; + version = "0.6.2.0"; + sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx"; buildDepends = [ aeson deepseq filepath hastache mtl mwcRandom parsec statistics time transformers vector vectorAlgorithms From 86750b45675842cd3c674711160e7611235bd167 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 24/51] haskell-data-memocombinators: update to version 0.4.4 --- .../libraries/haskell/data-memocombinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index 25f063c20ac..2b3adde1d72 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-memocombinators"; - version = "0.4.3"; - sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc"; + version = "0.4.4"; + sha256 = "06x79rgxi6cxrpzjzzsjk7yj7i0ajmcgns0n12lxakz9vxbqxyn2"; buildDepends = [ dataInttrie ]; meta = { homepage = "http://github.com/luqui/data-memocombinators"; From 4a383ed6c70c83154e838bdef13d057f26ca4e08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 25/51] haskell-ghc-mtl: update to version 1.0.1.2 --- pkgs/development/libraries/haskell/ghc-mtl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix index f885b9a5313..ea2495f6586 100644 --- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-mtl"; - version = "1.0.1.1"; - sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn"; + version = "1.0.1.2"; + sha256 = "06m8ynqlbvvs37w211ikldwvlvg4ry27x9l7idnwa1m8w2jkbkva"; buildDepends = [ MonadCatchIOMtl mtl ]; meta = { homepage = "http://darcsden.com/jcpetruzza/ghc-mtl"; From 09aef77b4ea6313c7c805d5ac2a85a8e3ad34a4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 26/51] haskell-heist: update to version 0.8.2 --- pkgs/development/libraries/haskell/heist/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 44ba8ba15ee..d87f4fe239e 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -1,16 +1,16 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree , filepath, MonadCatchIOTransformers, mtl, random, text, time -, transformers, unorderedContainers, vector, xmlhtml +, unorderedContainers, vector, xmlhtml }: cabal.mkDerivation (self: { pname = "heist"; - version = "0.8.1.1"; - sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh"; + version = "0.8.2"; + sha256 = "0zamggvfq9054vxznbnfq1fihk110ih8q0dza1rmsjb1h2s88rkj"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree filepath - MonadCatchIOTransformers mtl random text time transformers - unorderedContainers vector xmlhtml + MonadCatchIOTransformers mtl random text time unorderedContainers + vector xmlhtml ]; meta = { homepage = "http://snapframework.com/"; From 6f4063686ea48296e2e4a7e73eafcce9dbd664d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 27/51] haskell-hint: update to version 0.3.3.5 --- pkgs/development/libraries/haskell/hint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index 795d8c1d674..106b8591778 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hint"; - version = "0.3.3.4"; - sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy"; + version = "0.3.3.5"; + sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq"; buildDepends = [ extensibleExceptions filepath ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl random utf8String From 000791e74a511f862081aff90ab27304c88f0aba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 28/51] haskell-http-conduit: update to version 1.6.1.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 3e094e0c6b1..9a1d45c40f1 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.6.1.1"; - sha256 = "00xixsp1n37mb2in20lsxf460cyjbsp8dj2avys6hyrdn14ki130"; + version = "1.6.1.2"; + sha256 = "02dh7gh9pk5dj6dl28hn3vqvf9280b57bqas4w7zsgnhjivxy20x"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { monadControl mtl network regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void zlibConduit ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; From 5f8a0e285a942a32616e5440c8d1d19ea58ec020 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 29/51] haskell-network-conduit: update to version 0.6.1.1 --- .../libraries/haskell/network-conduit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 45f65e932c0..3b86b0699ca 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,12 +3,11 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "0.6.0"; - sha256 = "0y296v8b6xrxs9jw6az6flz9nsqgk60cnpc954pmp6mi5q8mbv7i"; + version = "0.6.1.1"; + sha256 = "00x5ks1qcq5smmd2g4bm23lb3ngdxmdlz822qkkj9l9c27lkn67n"; buildDepends = [ conduit liftedBase monadControl network transformers ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Stream socket data using conduits"; From b7cc6df1de045e30d80cac852156551518e20fc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 30/51] haskell-numbers: update to version 3000.1.0.0 --- pkgs/development/libraries/haskell/numbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index 8b57b3d7e96..b37ab7e5d4c 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "numbers"; - version = "3000.0.0.0"; - sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb"; + version = "3000.1.0.0"; + sha256 = "0iqpch8j2i2pnjq8waqb5y95jpmvbzx2r6zsvkja7sl4d578fgpn"; meta = { homepage = "https://github.com/DanBurton/numbers"; description = "Various number types"; From fca72874915ac187e202d50416269f619d0a712b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 31/51] haskell-persistent: update to version 1.0.1.3 --- pkgs/development/libraries/haskell/persistent/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index b410b36ea56..449debe0405 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.0.1.2"; - sha256 = "0gw635mhbn6w8aswiw9j41rdpi7rhnnhay2qgvlc8103s0g5lp9j"; + version = "1.0.1.3"; + sha256 = "156iv1iv807wm39sr98z0f10sbw4q0ac3lafgai0mq3ph5xysi80"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit @@ -15,7 +15,6 @@ cabal.mkDerivation (self: { unorderedContainers vector ]; extraLibraries = [ sqlite ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; From 864924a65df91939fd9096d814b980a2ff32a40c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 32/51] haskell-resourcet: update to version 0.4.0.2 --- pkgs/development/libraries/haskell/resourcet/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index efbd56cbe6a..95e051a3eec 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,12 +4,11 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.0.1"; - sha256 = "0idyb2xvjk9cbz9gy1gr6sw1mz6v9d8fgk0kw778n6k3h488dw9x"; + version = "0.4.0.2"; + sha256 = "0w4hm29dig6m4jm6y9zmyfnhwii7b88hqjqlvl6xmk5zxp1q7hc2"; buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; From 7d22f8d91ba84df601b88f7d25f844c1d418fbd3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 33/51] haskell-snap-core: update to version 0.9.2.2 --- pkgs/development/libraries/haskell/snap/core.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index a39442aef07..16df3f34756 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,19 +1,19 @@ { cabal, attoparsec, attoparsecEnumerator, blazeBuilder , blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq , enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl -, random, regexPosix, text, time, transformers, unixCompat -, unorderedContainers, vector, zlibEnum +, random, regexPosix, text, time, unixCompat, unorderedContainers +, vector, zlibEnum }: cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.2.1"; - sha256 = "18i0hfzc37q12nyp7g4sc87s4xcqz1crjwpnhh4y5fw66glzmq3q"; + version = "0.9.2.2"; + sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath HUnit - MonadCatchIOTransformers mtl random regexPosix text time - transformers unixCompat unorderedContainers vector zlibEnum + MonadCatchIOTransformers mtl random regexPosix text time unixCompat + unorderedContainers vector zlibEnum ]; meta = { homepage = "http://snapframework.com/"; From 4b9b535b74fe4e7a93c7388d938a677fbc40a468 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 34/51] haskell-snap-server: update to version 0.9.2.4 --- .../libraries/haskell/snap/server.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index c17b8e50e61..7f8dc878024 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -1,20 +1,18 @@ -{ cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder -, blazeBuilderEnumerator, caseInsensitive, directoryTree -, enumerator, filepath, MonadCatchIOTransformers, mtl, network -, snapCore, text, time, transformers, unixCompat +{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder +, blazeBuilderEnumerator, caseInsensitive, enumerator +, MonadCatchIOTransformers, mtl, network, snapCore, text, time +, unixCompat }: cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.9.2.3"; - sha256 = "0wl7clzwrd34d32sikd6vkj3pla9yni26mmdsnrjw1s3lq412yqd"; + version = "0.9.2.4"; + sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl"; buildDepends = [ - attoparsec attoparsecEnumerator binary blazeBuilder - blazeBuilderEnumerator caseInsensitive directoryTree enumerator - filepath MonadCatchIOTransformers mtl network snapCore text time - transformers unixCompat + attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator + caseInsensitive enumerator MonadCatchIOTransformers mtl network + snapCore text time unixCompat ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; From c30dc2231e1a5ce65b365386c48ef23be5baf2aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 35/51] haskell-snap: update to version 0.9.2.2 --- pkgs/development/libraries/haskell/snap/snap.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 83e149391c5..1676de1e840 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -2,14 +2,14 @@ , dataLens, dataLensTemplate, directoryTree, filepath, hashable , heist, logict, MonadCatchIOTransformers, mtl, mwcRandom , pwstoreFast, snapCore, snapServer, stm, syb, text, time -, transformers, unorderedContainers, utf8String, vector -, vectorAlgorithms, xmlhtml +, transformers, unorderedContainers, vector, vectorAlgorithms +, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.9.2.1"; - sha256 = "0gxnkr6icx2g16w3ab54cqy4x15xj6y9cs6qv8dg0xamm7kyyfhl"; + version = "0.9.2.2"; + sha256 = "1ql9c8b9arcd8zwlwsiipl4diah87sp339ljc5bc7yls1g4d9zsw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -17,9 +17,8 @@ cabal.mkDerivation (self: { dataLensTemplate directoryTree filepath hashable heist logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore snapServer stm syb text time transformers unorderedContainers - utf8String vector vectorAlgorithms xmlhtml + vector vectorAlgorithms xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From 4db1166d011d92ec2a1b668c54feca3c4c32eda7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 36/51] haskell-wai-extra: update to version 1.3.0.3 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 7c460681fcb..bc70d14ddf9 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.0.2"; - sha256 = "0w69wjfbzgg523n0rcs700qx0gsdhvlr0qjvqg1hppvi188llpwl"; + version = "1.3.0.3"; + sha256 = "0nfk24mwzf2v35vlvvhzb7a6ldr6pvw37m3ws3b3cv2m80jdd7kr"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network From 2112958f8a957d3d6d343963090e955d7d3b94ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 37/51] haskell-warp: update to version 1.3.3.2 --- pkgs/development/libraries/haskell/warp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index c4c2bfc4a69..0f4764c3e0e 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,14 +5,13 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.3.1"; - sha256 = "0nz5n574lgaii6i9ncc6dkzw2aw6g7hwjjq7v8njly2vpwygxn7s"; + version = "1.3.3.2"; + sha256 = "1w2i5nf3qh7p0xfrrp6x34rw3sxa48v703w1vlsikhyjdqs2crq8"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile transformers unixCompat void wai ]; - patchPhase = "sed -i -e 's|, lifted-base.*|, lifted-base|' warp.cabal"; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; From d330da6f54714d26b9e99a10bc897db6c7152758 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 38/51] haskell-yesod-auth: update to version 1.1.1.2 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index ec7b78fe6fd..765724e00d4 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.1.1"; - sha256 = "1ryq3jxcgb55ijjmcv0j234n9nay2ianifb59gz9akyv0sc3zcl9"; + version = "1.1.1.2"; + sha256 = "1agyazzkgwmp63vwx84bzalf9lwg14k5jshj6n97g1iagsiaxqa0"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 @@ -16,7 +16,6 @@ cabal.mkDerivation (self: { unorderedContainers wai yesodCore yesodForm yesodJson yesodPersistent ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; From a47d1d856908737fa36ecabfebf238d1d6205420 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 39/51] haskell-yesod-core: update to version 1.1.2.2 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 87723df26c3..061e3261d2a 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.2.1"; - sha256 = "195r19xsd3fvsirz62mkfxqgw5zi4lx700ly08h1i0kvmfnfx1g8"; + version = "1.1.2.2"; + sha256 = "13852r6s7p9b4zvg4pi9qfmgv8g21m0gqlw7bky05jy5a9c8v3a7"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { text time transformers transformersBase vector wai waiExtra yesodRoutes ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; From b8e30a8af6e1626a351f12f9736f5f1d7d9d7918 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 11 Oct 2012 10:31:42 +0200 Subject: [PATCH 40/51] Changed the netbeans expression to use openjdk, which should work now --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index dccc92a91f5..f1fd9adbe86 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, oraclejdk, unzip, which, makeWrapper, makeDesktopItem}: +{stdenv, fetchurl, jdk, unzip, which, makeWrapper, makeDesktopItem}: let desktopItem = makeDesktopItem { @@ -25,7 +25,7 @@ stdenv.mkDerivation { # Create a wrapper capable of starting it mkdir -p $out/bin makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ - --prefix PATH : ${oraclejdk}/bin:${which}/bin + --prefix PATH : ${jdk}/bin:${which}/bin # Create desktop item, so we can pick it from the KDE/GNOME menu mkdir -p $out/share/applications From 018068d7c5657b37a61f092936007c0a89134ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 11 Oct 2012 12:02:46 +0200 Subject: [PATCH 41/51] samba: fix cross-compilation --- pkgs/servers/samba/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 7952c73f48c..08c53182dd5 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { postPatch = # XXX: Awful hack to allow cross-compilation. '' sed -i source3/configure \ - -e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g' + -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' ''; # " preConfigure = From 702aec188157461c4bf410f0b1709a692e68fc5c Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Oct 2012 10:54:24 +0200 Subject: [PATCH 42/51] chromium: Use final implementation of BPF patch. The new version is the one already committed in trunk as revision 160697. In order to get into beta and stable this could take some while so we're going need to carry around that patch for some time. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1ea854c5e9d..acfb43e7caa 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -90,8 +90,8 @@ let maybeBpfTemporaryFix = let patch = fetchurl { - url = "https://chromiumcodereview.appspot.com/download/issue11032056_1_2.diff"; - sha256 = "eb13dc627940ad56939837ad1093b2c388f6cf79f1f25cdc1b2e25e987c73d1c"; + url = "https://chromiumcodereview.appspot.com/download/issue11073003_6001_7001.diff"; + sha256 = "bf61871cdaa8fea27ce15482a17048f67b426a55813c3832f9bd39ec47a9eb06"; }; needPatch = !versionOlder sourceInfo.version "23.0.1271.0"; in optional needPatch patch; From 50faa2cbef570f1f9a637f203d4786f95b5a734c Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Oct 2012 12:42:08 +0200 Subject: [PATCH 43/51] chromium: Update stable and beta channels. stable: 22.0.1229.79 (build tested) beta: 22.0.1229.94 (build and usage tested) Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 8dd406e5ea4..dbb0de72f30 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,13 +6,13 @@ sha256 = "0lp3r4n3d71wy2ndzcfwvrp9vc1ii98pxip1c8hfinz994ca1ykx"; }; beta = { - version = "23.0.1271.17"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.17.tar.bz2"; - sha256 = "1nyc2s378sx7ymmginipiphygg7s59iwg2kirlbgz60fl8wygzv2"; + version = "23.0.1271.26"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.26.tar.bz2"; + sha256 = "1iimpmm5lm5rvak49320lmmvwqr8xv4znp4h1pf65jzzx0apbgkh"; }; stable = { - version = "22.0.1229.79"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.79.tar.bz2"; - sha256 = "0f7py2hd7fnx5z0xrg2vwf675xbg9xvamx79jjyzbpljh32b3jh6"; + version = "22.0.1229.94"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.94.tar.bz2"; + sha256 = "1bqwlgmn0dm1xvd6v52zf9gjmykgq4fnw7rancbplfpl3rl7xbx0"; }; } From 21e59f4a5fe6e4c6719c8cf6802e8de71f6d853a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 11 Oct 2012 14:22:26 +0200 Subject: [PATCH 44/51] sphinx 1.1.3 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f511b64ceda..d0a2bd420d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2584,11 +2584,11 @@ let pythonPackages = python.modules // rec { }); sphinx = buildPythonPackage (rec { - name = "Sphinx-1.0.7"; + name = "Sphinx-1.1.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; - md5 = "42c722d48e52d4888193965dd473adb5"; + md5 = "8f55a6d4f87fc6d528120c5d1f983e98"; }; propagatedBuildInputs = [docutils jinja2 pygments]; From fa27534ec6be24f3b165dd47959cff46fe03ce8a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2012 11:05:33 -0400 Subject: [PATCH 45/51] pylint: Update to 0.26.0 --- pkgs/top-level/python-packages.nix | 35 +++++++++++++++++++----------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0a2bd420d4..387e8964705 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -187,14 +187,15 @@ let pythonPackages = python.modules // rec { }); - astng = buildPythonPackage rec { - name = "logilab-astng-0.21.1"; + logilab_astng = buildPythonPackage rec { + name = "logilab-astng-0.24.1"; src = fetchurl { - url = "ftp://ftp.logilab.org/pub/astng/${name}.tar.gz"; - sha256 = "0rqp2vwrnv6gkzdd96j078h1sz26plh49cmnyswy2wb6l4wans67"; + url = "http://download.logilab.org/pub/astng/${name}.tar.gz"; + sha256 = "00qxaxsax80sknwv25xl1r49lc4gbhkxs1kjywji4ad8y1npax0s"; }; - propagatedBuildInputs = [logilabCommon]; + + propagatedBuildInputs = [ logilab_common ]; }; beautifulsoup = buildPythonPackage (rec { @@ -1053,14 +1054,15 @@ let pythonPackages = python.modules // rec { }; }; - logilabCommon = buildPythonPackage rec { - name = "logilab-common-0.56.0"; + logilab_common = buildPythonPackage rec { + name = "logilab-common-0.58.2"; src = fetchurl { - url = "ftp://ftp.logilab.org/pub/common/${name}.tar.gz"; - sha256 = "14p557nqypbd10d8k7qs6jlm58pksiwh86wvvl0axyki00hj6971"; + url = "http://download.logilab.org/pub/common/${name}.tar.gz"; + sha256 = "0qfdyj2is0scpnkgpnqm12lh4yl27617l0irlilhk25cpgbbfbf9"; }; - propagatedBuildInputs = [unittest2]; + + propagatedBuildInputs = [ unittest2 ]; }; lxml = buildPythonPackage ( rec { @@ -1976,13 +1978,20 @@ let pythonPackages = python.modules // rec { pylint = buildPythonPackage rec { - name = "pylint-0.23.0"; + name = "pylint-0.26.0"; + namePrefix = ""; src = fetchurl { url = "ftp://ftp.logilab.org/pub/pylint/${name}.tar.gz"; - sha256 = "07091avcc2b374i5f3blszmawjcin8xssjfryz91qbxybb8r7c6d"; + sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835"; + }; + + propagatedBuildInputs = [ logilab_astng ]; + + meta = { + homepage = http://www.logilab.org/project/pylint; + description = "A bug and style checker for Python"; }; - propagatedBuildInputs = [astng]; }; From 2fa1b38853fc3c9eba02f47bf2d7031bf93e6f34 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2012 12:33:28 -0400 Subject: [PATCH 46/51] systemd: Properly handle device aliases used as dependencies http://lists.freedesktop.org/archives/systemd-devel/2012-October/006872.html --- pkgs/os-specific/linux/systemd/default.nix | 2 +- .../linux/systemd/fix-device-aliases.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/systemd/fix-device-aliases.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 36d341af5e6..5abef22395e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2"; }; - patches = [ ./reexec.patch ./ignore-duplicates.patch ]; + patches = [ ./reexec.patch ./ignore-duplicates.patch ./fix-device-aliases.patch ]; buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl diff --git a/pkgs/os-specific/linux/systemd/fix-device-aliases.patch b/pkgs/os-specific/linux/systemd/fix-device-aliases.patch new file mode 100644 index 00000000000..508fd0ec074 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/fix-device-aliases.patch @@ -0,0 +1,14 @@ +diff --git a/src/core/device.c b/src/core/device.c +index 5307341..7bbe99a 100644 +--- a/src/core/device.c ++++ b/src/core/device.c +@@ -255,8 +255,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p + if (!is_path(alias)) + log_warning("SYSTEMD_ALIAS for %s is not a path, ignoring: %s", sysfs, alias); + else { +- if ((r = device_add_escaped_name(u, alias)) < 0) +- goto fail; ++ device_update_unit(m, dev, alias, false); + } + } + From bf5967e77e9c4cfc69501cc12a626cb5c6f22537 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2012 12:33:47 -0400 Subject: [PATCH 47/51] systemd: Add libgcrypt dependency This is required for forward secure sealing of the journal. --- pkgs/os-specific/linux/systemd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5abef22395e..2219d82138f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils -, glib, kbd, libxslt, coreutils +, glib, kbd, libxslt, coreutils, libgcrypt }: assert stdenv.gcc.libc or null != null; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl - /* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt + /* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt libgcrypt ]; configureFlags = @@ -56,6 +56,9 @@ stdenv.mkDerivation rec { # lead to a cyclic dependency. "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" "-fno-stack-protector" + # Work around our kernel headers being too old. FIXME: remove + # this after the next stdenv update. + "-DFS_NOCOW_FL=0x00800000" ]; makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; From e117d037e39ac185327cf86282331185f19268c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2012 15:38:54 -0400 Subject: [PATCH 48/51] iproute: Update to 3.6.0 --- pkgs/os-specific/linux/iproute/default.nix | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index cc5339ba900..c97c7416de1 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,11 +1,11 @@ -{fetchurl, stdenv, flex, bison, db4, iptables}: +{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }: stdenv.mkDerivation rec { - name = "iproute2-2.6.35"; + name = "iproute2-3.6.0"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/iproute/iproute2-2.6.35.tar.bz2/b0f281b3124bf04669e18f5fe16d4934/iproute2-2.6.35.tar.bz2"; - sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla"; + url = http://kernel.org/pub/linux/utils/net/iproute2/iproute2-3.6.0.tar.xz; + sha256 = "0d05av2s7p552yszgj6glz6d74jlmg392s7n74hicgqfl16m85rd"; }; patches = [ ./vpnc.patch ]; @@ -15,20 +15,25 @@ stdenv.mkDerivation rec { patchShebangs ./configure sed -e '/ARPDDIR/d' -i Makefile ''; + postConfigure = "cat Config"; makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin" - + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" - + " MANDIR=$(out)/share/man"; + + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" + + " MANDIR=$(out)/share/man"; - buildInputs = [db4 iptables]; - buildNativeInputs = [bison flex db4]; + buildInputs = [ db4 iptables ]; + buildNativeInputs = [ bison flex pkgconfig ]; + + enableParallelBuilding = true; + + # Get rid of useless TeX/SGML docs. + postInstall = "rm -rf $out/share/doc"; meta = { - homepage = - http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2; - description = "A collection of utilities for controlling TCP / IP" - + " networking and traffic control in Linux"; + homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2; + description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } From b70d41d309f63ffee761b1131d13c03ddec024a9 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Thu, 11 Oct 2012 13:50:28 -0700 Subject: [PATCH 49/51] - long descriptions --- pkgs/os-specific/linux/spl/default.nix | 16 ++++++++++++++++ pkgs/os-specific/linux/zfs/default.nix | 20 +++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 96565fffa0e..63a2a8454aa 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -31,6 +31,22 @@ stdenv.mkDerivation { meta = { description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + + longDescription = '' + This kernel module is a porting layer for ZFS to work inside the linux kernel. + + LICENSE NOTE: the Linux kernel is licensed under the GNU General Public + License which is incompatible with ZFS which is licensed under the Sun CDDL. + While both the GPL and CDDL are open source licenses their terms are such that + it is impossible to simultaneously satisfy both licenses. This means that a + single derived work of the Linux kernel and ZFS cannot be legally distributed. + + The ZFS code can be modified to build as a CDDL licensed kernel module + which is not distributed as part of the Linux kernel. This makes a Native ZFS + on Linux implementation possible if you are willing to download and build it + yourself. + ''; + homepage = http://zfsonlinux.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.cddl; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 43e7b2fd95d..fa0a5b47f55 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -25,7 +25,25 @@ stdenv.mkDerivation { ''; meta = { - description = "Native ZFS for Linux"; + description = "ZFS Filesystem Linux Kernel module"; + longDescription = '' + + ZFS is a filesystem that combines a logical volume manager with a + Copy-On-Write filesystem with data integrity detection and repair, + snapshotting, cloning, block devices, deduplication, and more. + + LICENSE NOTE: the Linux kernel is licensed under the GNU General Public + License which is incompatible with ZFS which is licensed under the Sun CDDL. + While both the GPL and CDDL are open source licenses their terms are such that + it is impossible to simultaneously satisfy both licenses. This means that a + single derived work of the Linux kernel and ZFS cannot be legally distributed. + + The ZFS code can be modified to build as a CDDL licensed kernel module + which is not distributed as part of the Linux kernel. This makes a Native ZFS + on Linux implementation possible if you are willing to download and build it + yourself. + ''; + homepage = http://zfsonlinux.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.cddl; From 85140f590afcd57eb3f6cb7940fcc019c234194b Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 12 Oct 2012 08:38:38 +0200 Subject: [PATCH 50/51] zfs: fix udev rules This patch fixes Nixos checking of udev rules: Checking that all programs call by absolute paths in udev rules exist ... FAIL /lib/udev/vdev_id is called in udev rules but not installed by udev --- pkgs/os-specific/linux/zfs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index fa0a5b47f55..cbb8f30e1b3 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" ''; configureFlags = '' From b1169e550985976bd22d7d9ac999fb43a8d847e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Oct 2012 15:22:48 +0200 Subject: [PATCH 51/51] ghc-*-binary: remove redundant assertion Any attempt to instantiate these expressions on an unsupported platform is going to 'throw' an error. The call to 'assert' doesn't add any value to that (and generates less readable error messages, too). Further details are available at . --- pkgs/development/compilers/ghc/6.10.1-binary.nix | 8 +------- pkgs/development/compilers/ghc/6.10.2-binary.nix | 8 +------- pkgs/development/compilers/ghc/6.12.1-binary.nix | 8 +------- pkgs/development/compilers/ghc/6.4.2-binary.nix | 8 +------- pkgs/development/compilers/ghc/7.0.4-binary.nix | 8 +------- pkgs/development/compilers/ghc/7.4.2-binary.nix | 8 +------- 6 files changed, 6 insertions(+), 42 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix index 5a15cc0dff7..353a4176ea4 100644 --- a/pkgs/development/compilers/ghc/6.10.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, libedit, ncurses, gmp}: -let - supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "6.10.1"; @@ -104,5 +98,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 616c9de7ede..02f1db354a1 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, libedit, ncurses, gmp}: -let - supportedPlatforms = ["x86_64-linux" "i686-linux"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "6.10.2"; @@ -103,5 +97,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix index a84b75d705b..23486b5f4fa 100644 --- a/pkgs/development/compilers/ghc/6.12.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, ncurses, gmp}: -let - supportedPlatforms = ["x86_64-linux" "i686-linux"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "6.12.1"; @@ -105,5 +99,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix index 2ed6f2be4fe..1a5bf059e9f 100644 --- a/pkgs/development/compilers/ghc/6.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, readline, ncurses, gmp}: -let - supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation { name = if stdenv.system == "i686-darwin" then "ghc-6.6.1-binary" else "ghc-6.4.2-binary"; @@ -68,5 +62,5 @@ stdenv.mkDerivation { '' else ""; - meta.platforms = supportedPlatforms; + meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 0baf9718f85..0bfc81a17a4 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, ncurses, gmp}: -let - supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "7.0.4"; @@ -93,5 +87,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 85e10d7090c..e0a8fee4b66 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, ncurses, gmp}: -let - supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "7.4.2"; @@ -93,5 +87,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; }