From 13170a9694fc7b77501425b20c50e8d3b7221f45 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Jun 2018 03:39:14 +0000 Subject: [PATCH] Revert "libbsd-freedesktop: re-init at 0.9.1, use for samba" This reverts commit 8b5ed12952300846928555b20fc10893f9df3965. --- pkgs/development/libraries/libbsd/default.nix | 21 ------------------- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/development/libraries/libbsd/default.nix diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix deleted file mode 100644 index 114d3209b58a..000000000000 --- a/pkgs/development/libraries/libbsd/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libbsd-${version}"; - version = "0.9.1"; - - src = fetchurl { - url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n"; - }; - - patches = []; - - meta = with stdenv.lib; { - description = "Common functions found on BSD systems, Freedesktop fork"; - homepage = https://libbsd.freedesktop.org/; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ raskin ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc29d48760b8..c700f37fed9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12963,7 +12963,6 @@ with pkgs; samba4 = callPackage ../servers/samba/4.x.nix { python = python2; - libbsd = libbsd-freedesktop; }; sambaMaster = callPackage ../servers/samba/master.nix { }; @@ -21532,8 +21531,6 @@ with pkgs; libbsd = netbsd.compat; - libbsd-freedesktop = callPackage ../development/libraries/libbsd {}; - inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) netbsd;