public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Removed makePortmap; use makeOverridable.

Browse Source 
svn path=/nixpkgs/trunk/; revision=14631
This commit is contained in:
Eelco Dolstra 2009-03-20 16:17:08 +00:00
parent 32d1c53b10
commit 3be3abe6ab
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/servers/portmap/default.nix
View File

@ -1,10 +1,11 @@
{ fetchurl, stdenv, lib, tcpWrapper { fetchurl, stdenv, lib, tcpWrapper
, daemonUser, daemonUID, daemonGID }: , daemonUser ? false, daemonUID ? false, daemonGID ? false }:
assert daemonUser -> (!daemonUID && !daemonGID); assert daemonUser -> (!daemonUID && !daemonGID);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "portmap-6.0"; name = "portmap-6.0";
src = fetchurl { src = fetchurl {
url = "http://neil.brown.name/portmap/${name}.tgz"; url = "http://neil.brown.name/portmap/${name}.tgz";
sha256 = "1pj13ll4mbfwjwpn3fbg03qq9im6v2i8fcpa3ffp4viykz9j1j02"; sha256 = "1pj13ll4mbfwjwpn3fbg03qq9im6v2i8fcpa3ffp4viykz9j1j02";

12
pkgs/top-level/all-packages.nix
View File

@ -6454,15 +6454,9 @@ let
inherit fetchurl stdenv apacheHttpd jdk; inherit fetchurl stdenv apacheHttpd jdk;
}; };
# This function is typically called by the NixOS Upstart job to specify the portmap = makeOverridable (import ../servers/portmap) {
# right UID/GID for `portmap'. inherit fetchurl stdenv lib tcpWrapper;
makePortmap = { daemonUser ? false, daemonGID ? false, daemonUID ? false }: };
(import ../servers/portmap {
inherit fetchurl stdenv lib tcpWrapper
daemonUser daemonGID daemonUID;
});
portmap = makePortmap {};
mysql4 = import ../servers/sql/mysql { mysql4 = import ../servers/sql/mysql {
inherit fetchurl stdenv ncurses zlib perl; inherit fetchurl stdenv ncurses zlib perl;