From 5782390a5dbfba16bb086f0b5127e475b6caf392 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Oct 2006 15:09:27 +0000
Subject: * Fix some URLs.

svn path=/nixpkgs/trunk/; revision=6714
---
 pkgs/os-specific/linux/syslinux/default.nix       | 13 ++++++++++++-
 pkgs/os-specific/linux/syslinux/syslinux-3.11.nix | 12 ------------
 pkgs/os-specific/linux/syslinux/syslinux-3.20.nix | 12 ------------
 3 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/syslinux/syslinux-3.11.nix
 delete mode 100644 pkgs/os-specific/linux/syslinux/syslinux-3.20.nix

(limited to 'pkgs/os-specific/linux')

diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index da47807c666..61de3b46519 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1 +1,12 @@
-import ./syslinux-3.20.nix
+{stdenv, fetchurl, nasm, perl}:
+
+stdenv.mkDerivation {
+  name = "syslinux-3.20";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/syslinux-3.20.tar.bz2;
+    md5 = "0701e0de1de6d31bdd889384b041e5b7";
+  };
+ buildInputs = [nasm perl];
+ patches = [./syslinux-3.20-installpath.patch];
+}
diff --git a/pkgs/os-specific/linux/syslinux/syslinux-3.11.nix b/pkgs/os-specific/linux/syslinux/syslinux-3.11.nix
deleted file mode 100644
index e93d77b8d0f..00000000000
--- a/pkgs/os-specific/linux/syslinux/syslinux-3.11.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, nasm, perl}:
-
-stdenv.mkDerivation {
-  name = "syslinux-3.11";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.11.tar.bz2;
-    md5 = "513ff71287a4397d507879a1a836c2e8";
-  };
- buildInputs = [nasm perl];
- patches = [./syslinux-installpath.patch];
-}
diff --git a/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix b/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix
deleted file mode 100644
index 61de3b46519..00000000000
--- a/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, nasm, perl}:
-
-stdenv.mkDerivation {
-  name = "syslinux-3.20";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/syslinux-3.20.tar.bz2;
-    md5 = "0701e0de1de6d31bdd889384b041e5b7";
-  };
- buildInputs = [nasm perl];
- patches = [./syslinux-3.20-installpath.patch];
-}
-- 
cgit 1.4.1