diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-11-29 11:13:13 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-11-29 13:46:28 +0100 |
commit | f222ebdd605256cc4ec76542dd4fe40b6f72df03 (patch) | |
tree | e045fef6e541868b78da6510688f1198aca0c823 | |
parent | fc14aebab844277c4dee41a549431cac959cd1ba (diff) | |
download | nixpkgs-f222ebdd605256cc4ec76542dd4fe40b6f72df03.tar nixpkgs-f222ebdd605256cc4ec76542dd4fe40b6f72df03.tar.gz nixpkgs-f222ebdd605256cc4ec76542dd4fe40b6f72df03.tar.bz2 nixpkgs-f222ebdd605256cc4ec76542dd4fe40b6f72df03.tar.lz nixpkgs-f222ebdd605256cc4ec76542dd4fe40b6f72df03.tar.xz nixpkgs-f222ebdd605256cc4ec76542dd4fe40b6f72df03.tar.zst nixpkgs-f222ebdd605256cc4ec76542dd4fe40b6f72df03.zip |
fusionio-vsl: remove
Broken on all kernel version. No update in nixpkgs since 2015
-rw-r--r-- | pkgs/os-specific/linux/fusionio/srcs.nix | 22 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fusionio/util.nix | 45 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch | 13 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fusionio/vsl.nix | 39 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
5 files changed, 0 insertions, 123 deletions
diff --git a/pkgs/os-specific/linux/fusionio/srcs.nix b/pkgs/os-specific/linux/fusionio/srcs.nix deleted file mode 100644 index fb632a6e9fb..00000000000 --- a/pkgs/os-specific/linux/fusionio/srcs.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl }: -rec { - version = "3.2.10"; - - libvsl = fetchurl { - name = "fusionio-libvsl-${version}.deb"; - url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2Wc01uNk1nVURMVFk"; - sha256 = "1i8ii9dlyskj2dvad7nfvlm1wz2s4gy5llbl29hfa13w6nhcl5wk"; - }; - - util = fetchurl { - name = "fusionio-util-${version}.deb"; - url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbDVuQkwzWjZONGs"; - sha256 = "0aw64kk5cwchjhqh5n1lpqrrh5gn4qdalnmasd25z7sijy2flxgq"; - }; - - vsl = fetchurl { - name = "fusionio-iomemory-vsl-${version}.tar.gz"; - url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbXFMbExEMUFCcWM"; - sha256 = "1zm20aa1jmmqcqkb4p9r4jsgbg371zr1abdz32rw02i9687fsgcc"; - }; -} diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix deleted file mode 100644 index 6327a95f39d..00000000000 --- a/pkgs/os-specific/linux/fusionio/util.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, dpkg, glibc, gcc, libuuid }: - -let - srcs = import ./srcs.nix { inherit fetchurl; }; -in -stdenv.mkDerivation { - name = "fusionio-util-${srcs.version}"; - - nativeBuildInputs = [ dpkg ]; - - buildCommand = '' - dpkg-deb -R ${srcs.libvsl} $TMPDIR - dpkg-deb -R ${srcs.util} $TMPDIR - - rm $TMPDIR/usr/bin/fio-{bugreport,sanitize} - - mkdir -p $out - cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out - for BIN in $(find $out/bin -type f); do - echo Patching $BIN - patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" --set-rpath "${stdenv.lib.makeLibraryPath [ glibc gcc.cc libuuid ] }:$out/lib" $BIN - - # Test our binary to see if it was correctly patched - set +e - $BIN --help >/dev/null 2>&1 - ST="$?" - set -e - if [ "$ST" -ge "10" ]; then - echo "Failed testing $BIN" - exit 1; - fi - done - ''; - - dontStrip = true; - - meta = with stdenv.lib; { - homepage = http://fusionio.com; - description = "Fusionio command line utilities"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - broken = stdenv.hostPlatform.system != "x86_64-linux"; - maintainers = with maintainers; [ wkennington ]; - }; -} diff --git a/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch b/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch deleted file mode 100644 index 25887ceee0f..00000000000 --- a/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kfile.c b/kfile.c -index 5014e77..a65d921 100644 ---- a/kfile.c -+++ b/kfile.c -@@ -51,7 +51,7 @@ fusion_inode * noinline kfio_fs_inode(fusion_file *fp) - #if KFIOC_STRUCT_FILE_HAS_PATH - return (fusion_inode *) ((struct file *)fp)->f_path.dentry->d_inode; - #else -- return (fusion_inode *) ((struct file *)fp)->f_dentry->d_inode; -+ return (fusion_inode *) file_inode((struct file *)fp); - #endif - } - diff --git a/pkgs/os-specific/linux/fusionio/vsl.nix b/pkgs/os-specific/linux/fusionio/vsl.nix deleted file mode 100644 index 6ebe2e0cdaf..00000000000 --- a/pkgs/os-specific/linux/fusionio/vsl.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, kernel }: - -let - srcs = import ./srcs.nix { inherit fetchurl; }; -in -stdenv.mkDerivation rec { - name = "fusionio-iomemory-vsl-${srcs.version}"; - - src = srcs.vsl; - - hardeningDisable = [ "pic" ]; - - prePatch = '' - cd root/usr/src/iomemory-vsl-* - ''; - - patches = stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "3.19") ./vsl-fix-file-inode.patch; - - preBuild = '' - sed -i Makefile kfio_config.sh \ - -e "s,\(KERNELDIR=\"\|KERNEL_SRC =\)[^\"]*,\1${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,g" - export DKMS_KERNEL_VERSION=${kernel.modDirVersion} - export TARGET="x86_64_cc48" - ''; - - installPhase = '' - export INSTALL_ROOT=$out - make modules_install - ''; - - meta = with stdenv.lib; { - homepage = http://fusionio.com; - description = "Kernel driver for accessing fusion-io cards"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - broken = stdenv.hostPlatform.system != "x86_64-linux"; - maintainers = with maintainers; [ wkennington ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b188f985e46..d31d2b6125c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14201,8 +14201,6 @@ with pkgs; fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; - fusionio-util = callPackage ../os-specific/linux/fusionio/util.nix { }; - fxload = callPackage ../os-specific/linux/fxload { }; gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; @@ -14485,8 +14483,6 @@ with pkgs; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; - fusionio-vsl = callPackage ../os-specific/linux/fusionio/vsl.nix { }; - lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { }; |