public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

open-iscsi: 2.0-871 -> 2.0-873

Browse Source 
remove the kernel patch, since the package no longer builds the module, its already in the kernel
move it from the kernel function to the main all-packages list
This commit is contained in:
michael bishop 2015-09-23 07:03:42 -03:00
parent 2a574cb526
commit efa5b92bfc
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/open-iscsi/default.nix
View File

@ -1,27 +1,23 @@
{ stdenv, fetchurl, kernel}: { stdenv, fetchurl }:
let let
pname = "open-iscsi-2.0-871"; pname = "open-iscsi-2.0-873";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${pname}-${kernel.version}"; name = "${pname}";
src = fetchurl { src = fetchurl {
url = "http://www.open-iscsi.org/bits/${pname}.tar.gz"; url = "http://www.open-iscsi.org/bits/${pname}.tar.gz";
sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw"; sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx";
}; };
KSRC = "${kernel.dev}/lib/modules/*/build";
DESTDIR = "$(out)"; DESTDIR = "$(out)";
preConfigure = '' preConfigure = ''
sed -i 's|/usr/|/|' Makefile sed -i 's|/usr/|/|' Makefile
''; '';
patches = [./kernel.patch];
meta = { meta = {
description = "A high performance, transport independent, multi-platform implementation of RFC3720"; description = "A high performance, transport independent, multi-platform implementation of RFC3720";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
homepage = http://www.open-iscsi.org; homepage = http://www.open-iscsi.org;
broken = true;
}; };
} }

12
pkgs/os-specific/linux/open-iscsi/kernel.patch
View File

@ -1,12 +0,0 @@
*** open-iscsi-2.0-871/kernel/Makefile 2009-07-11 05:55:58.000000000 +0200
--- open-iscsi-2.0-871-new/kernel/Makefile 2010-08-30 11:37:56.000000000 +0200
***************
*** 101,106 ****
--- 101,107 ----
linux_2_6_29: $(unpatch_code)
linux_2_6_30: $(unpatch_code)
+ linux_2_6_32: $(unpatch_code)
do_unpatch_code:

4
pkgs/top-level/all-packages.nix
View File

@ -9577,6 +9577,8 @@ let
linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
openiscsi = callPackage ../os-specific/linux/open-iscsi { };
# -- Linux kernel expressions ------------------------------------------------ # -- Linux kernel expressions ------------------------------------------------
linuxHeaders = linuxHeaders_3_12; linuxHeaders = linuxHeaders_3_12;
@ -9757,8 +9759,6 @@ let
openafsClient = callPackage ../servers/openafs-client { }; openafsClient = callPackage ../servers/openafs-client { };
openiscsi = callPackage ../os-specific/linux/open-iscsi { };
wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; kernelHeaders = callPackage ../os-specific/linux/kernel-headers { };