From 5ad882951b301ce4d789b6e6b6678afbd0b3bcb9 Mon Sep 17 00:00:00 2001
From: namore <roman.naumann@hu-berlin.de>
Date: Tue, 24 May 2016 13:26:30 +0200
Subject: olsrd: fix top-level name and directory naming (#15663)

---
 pkgs/tools/networking/olsrd/default.nix | 24 ++++++++++++++++++++++++
 pkgs/tools/networking/oslrd/default.nix | 24 ------------------------
 2 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/tools/networking/olsrd/default.nix
 delete mode 100644 pkgs/tools/networking/oslrd/default.nix

(limited to 'pkgs/tools/networking')

diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix
new file mode 100644
index 000000000000..90f686f77ea6
--- /dev/null
+++ b/pkgs/tools/networking/olsrd/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, bison, flex }:
+
+stdenv.mkDerivation rec {
+  name = "olsrd-0.6.6.1";
+
+  src = fetchurl {
+    url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2";
+    sha256 = "1fphbh9x724r83gxxrd13zv487s4svnr9jdy76h4f36xxb15pnp8";
+  };
+
+  buildInputs = [ bison flex ];
+
+  preConfigure = ''
+    makeFlags="prefix=$out ETCDIR=$out/etc"
+  '';
+
+  meta = {
+    description = "An adhoc wireless mesh routing daemon";
+    license = stdenv.lib.licenses.bsd3;
+    homepage = http://olsr.org/;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix
deleted file mode 100644
index 90f686f77ea6..000000000000
--- a/pkgs/tools/networking/oslrd/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, bison, flex }:
-
-stdenv.mkDerivation rec {
-  name = "olsrd-0.6.6.1";
-
-  src = fetchurl {
-    url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2";
-    sha256 = "1fphbh9x724r83gxxrd13zv487s4svnr9jdy76h4f36xxb15pnp8";
-  };
-
-  buildInputs = [ bison flex ];
-
-  preConfigure = ''
-    makeFlags="prefix=$out ETCDIR=$out/etc"
-  '';
-
-  meta = {
-    description = "An adhoc wireless mesh routing daemon";
-    license = stdenv.lib.licenses.bsd3;
-    homepage = http://olsr.org/;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
-- 
cgit 1.4.1