diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-20 17:00:12 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-20 17:00:12 +0000 |
commit | 3736bd071629b8bee98998af9d287064168df482 (patch) | |
tree | 4a5281d1f226c4fb0021f3cf26921c2a16ca6337 /pkgs/os-specific/linux/wis-go7007 | |
parent | 1f9af0f18d58e1c891b215952da1560f8947fc3d (diff) | |
download | nixlib-3736bd071629b8bee98998af9d287064168df482.tar nixlib-3736bd071629b8bee98998af9d287064168df482.tar.gz nixlib-3736bd071629b8bee98998af9d287064168df482.tar.bz2 nixlib-3736bd071629b8bee98998af9d287064168df482.tar.lz nixlib-3736bd071629b8bee98998af9d287064168df482.tar.xz nixlib-3736bd071629b8bee98998af9d287064168df482.tar.zst nixlib-3736bd071629b8bee98998af9d287064168df482.zip |
* Remove misguided patch.
svn path=/nixpkgs/trunk/; revision=12171
Diffstat (limited to 'pkgs/os-specific/linux/wis-go7007')
-rw-r--r-- | pkgs/os-specific/linux/wis-go7007/default.nix | 9 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wis-go7007/wis-go7007-0.9.8-fix-udev.patch | 22 |
2 files changed, 4 insertions, 27 deletions
diff --git a/pkgs/os-specific/linux/wis-go7007/default.nix b/pkgs/os-specific/linux/wis-go7007/default.nix index 1a2bacdcfe1f..150692601af7 100644 --- a/pkgs/os-specific/linux/wis-go7007/default.nix +++ b/pkgs/os-specific/linux/wis-go7007/default.nix @@ -12,17 +12,16 @@ stdenv.mkDerivation { { url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-tv/wis-go7007/files/wis-go7007-0.9.8-kernel-2.6.17.diff?rev=1.1"; sha256 = "0cizbg82fdl5byhvpkdx64qa02xcahdyddi2l2jn95sxab28a5yg"; } - # (replaced by ./wis-go7007-0.9.8-fix-udev.patch below, which includes an entry for PCI device 093b:a104) - #{ url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-tv/wis-go7007/files/wis-go7007-0.9.8-fix-udev.diff?rev=1.2"; - # sha256 = "1985lcb7gh5zsf3lm0b43zd6q0cb9q4z376n9q060bh99yw6m0w1"; - #} + { url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-tv/wis-go7007/files/wis-go7007-0.9.8-fix-udev.diff?rev=1.2"; + sha256 = "1985lcb7gh5zsf3lm0b43zd6q0cb9q4z376n9q060bh99yw6m0w1"; + } { url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-tv/wis-go7007/files/snd.patch?rev=1.1"; sha256 = "0a6dz1l16pz1fk77s3awxh635cacbivfcfnd1carbx5jp2gq3jna"; } { url = http://home.comcast.net/~bender647/go7007/wis-go7007-2.6.24-no_algo_control.diff; sha256 = "1a7jkcsnzagir3wpsj60pjrr9wgfaqq21jlmq6s0qg9hqg4nzbvf"; } - ] ++ [./wis-go7007-0.9.8-fix-udev.patch]; + ]; buildInputs = [ncurses]; diff --git a/pkgs/os-specific/linux/wis-go7007/wis-go7007-0.9.8-fix-udev.patch b/pkgs/os-specific/linux/wis-go7007/wis-go7007-0.9.8-fix-udev.patch deleted file mode 100644 index 827459e723f0..000000000000 --- a/pkgs/os-specific/linux/wis-go7007/wis-go7007-0.9.8-fix-udev.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ru wis-go7007-linux-0.9.8-orig/udev/wis-ezusb.rules.in wis-go7007-linux-0.9.8/udev/wis-ezusb.rules.in ---- wis-go7007-linux-0.9.8-orig/udev/wis-ezusb.rules.in 2007-04-26 10:32:05.967814203 +0200 -+++ wis-go7007-linux-0.9.8/udev/wis-ezusb.rules.in 2007-04-26 10:38:00.372601940 +0200 -@@ -1,8 +1,10 @@ --ACTION=="add", BUS=="usb", ENV{PRODUCT}=="93b/a002/*", \ -- RUN+="@FXLOAD@ -t fx2 -I @FIRMWARE_DIR@/ezusb/hpi_PX-M402U.hex" --ACTION=="add", BUS=="usb", ENV{PRODUCT}=="93b/a004/*", \ -- RUN+="@FXLOAD@ -t fx2 -I @FIRMWARE_DIR@/ezusb/hpi_PX-TV402U.hex" --ACTION=="add", BUS=="usb", ENV{PRODUCT}=="eb1/6666/*", \ -- RUN+="@FXLOAD@ -t fx2 -I @FIRMWARE_DIR@/ezusb/hpi_LR192.hex" --ACTION=="add", BUS=="usb", ENV{PRODUCT}=="eb1/6668/*", \ -- RUN+="@FXLOAD@ -t fx2 -I @FIRMWARE_DIR@/ezusb/hpi_StarTrek.hex" -+ACTION=="add", SUBSYSTEM=="usb_device", ATTRS{idVendor}=="093b", ATTRS{idProduct}=="a002", \ -+ RUN+="@FXLOAD@ -t fx2 -I @FIRMWARE_DIR@/ezusb/hpi_PX-M402U.hex -D %N" -+ACTION=="add", SUBSYSTEM=="usb_device", ATTRS{idVendor}=="093b", ATTRS{idProduct}=="a004", \ -+ RUN+="@FXLOAD@ -t fx2 -I @FIRMWARE_DIR@/ezusb/hpi_PX-TV402U.hex -D %N" -+ACTION=="add", SUBSYSTEM=="usb_device", ATTRS{idVendor}=="093b", ATTRS{idProduct}=="a104", \ -+ RUN+="@FXLOAD@ -t fx2 -I @FIRMWARE_DIR@/ezusb/hpi_PX-TV402U.hex -D %N" -+ACTION=="add", SUBSYSTEM=="usb_device", ATTRS{idVendor}=="0eb1", ATTRS{idProduct}=="6666", \ -+ RUN+="@FXLOAD@ -t fx2 -I @FIRMWARE_DIR@/ezusb/hpi_LR192.hex -D %N" -+ACTION=="add", SUBSYSTEM=="usb_device", ATTRS{idVendor}=="0eb1", ATTRS{idProduct}=="6668", \ -+ RUN+="@FXLOAD@ -t fx2 -I @FIRMWARE_DIR@/ezusb/hpi_StarTrek.hex -D %N" |