diff options
author | michael bishop <cleverca22@gmail.com> | 2015-09-23 07:03:42 -0300 |
---|---|---|
committer | michael bishop <cleverca22@gmail.com> | 2015-09-23 12:31:41 -0300 |
commit | efa5b92bfca97a23724faceeba06e6fdcfceeabe (patch) | |
tree | f17520ca439726ca2214aa4293af7899c7d923bd /pkgs/os-specific | |
parent | 2a574cb526a6f4daf750b914d4469092d7a6c3e4 (diff) | |
download | nixpkgs-efa5b92bfca97a23724faceeba06e6fdcfceeabe.tar nixpkgs-efa5b92bfca97a23724faceeba06e6fdcfceeabe.tar.gz nixpkgs-efa5b92bfca97a23724faceeba06e6fdcfceeabe.tar.bz2 nixpkgs-efa5b92bfca97a23724faceeba06e6fdcfceeabe.tar.lz nixpkgs-efa5b92bfca97a23724faceeba06e6fdcfceeabe.tar.xz nixpkgs-efa5b92bfca97a23724faceeba06e6fdcfceeabe.tar.zst nixpkgs-efa5b92bfca97a23724faceeba06e6fdcfceeabe.zip |
open-iscsi: 2.0-871 -> 2.0-873
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
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/open-iscsi/default.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/open-iscsi/kernel.patch | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 88ab08e6c3d..c4e39e45cad 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,27 +1,23 @@ -{ stdenv, fetchurl, kernel}: +{ stdenv, fetchurl }: let - pname = "open-iscsi-2.0-871"; + pname = "open-iscsi-2.0-873"; in stdenv.mkDerivation { - name = "${pname}-${kernel.version}"; + name = "${pname}"; src = fetchurl { url = "http://www.open-iscsi.org/bits/${pname}.tar.gz"; - sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw"; + sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx"; }; - KSRC = "${kernel.dev}/lib/modules/*/build"; DESTDIR = "$(out)"; preConfigure = '' sed -i 's|/usr/|/|' Makefile ''; - patches = [./kernel.patch]; - meta = { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.open-iscsi.org; - broken = true; }; } diff --git a/pkgs/os-specific/linux/open-iscsi/kernel.patch b/pkgs/os-specific/linux/open-iscsi/kernel.patch deleted file mode 100644 index 48dfa195400..00000000000 --- a/pkgs/os-specific/linux/open-iscsi/kernel.patch +++ /dev/null @@ -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: |