dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #124147 from superherointj/package-firebird-v4.0.0

Browse Source
This commit is contained in:
Sandro 2021-05-27 05:13:50 +02:00 committed by GitHub
commit 5619e3eb35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nixos/modules/services/databases/firebird.nix
View File

@ -43,17 +43,15 @@ in
enable = mkEnableOption "the Firebird super server";
package = mkOption {
default = pkgs.firebirdSuper;
defaultText = "pkgs.firebirdSuper";
default = pkgs.firebird;
defaultText = "pkgs.firebird";
type = types.package;
/*
Example: <code>package = pkgs.firebirdSuper.override { icu =
pkgs.icu; };</code> which is not recommended for compatibility
reasons. See comments at the firebirdSuper derivation
*/
example = ''
<code>package = pkgs.firebird_3;</code>
'';
description = ''
Which firebird derivation to use.
Which Firebird package to be installed: <code>pkgs.firebird_3</code>
For SuperServer use override: <code>pkgs.firebird_3.override { superServer = true; };</code>
'';
};
@ -74,7 +72,7 @@ in
};
baseDir = mkOption {
default = "/var/db/firebird"; # ubuntu is using /var/lib/firebird/2.1/data/.. ?
default = "/var/lib/firebird";
type = types.str;
description = ''
Location containing data/ and system/ directories.
@ -111,6 +109,14 @@ in
cp ${firebird}/security2.fdb "${systemDir}"
fi
if ! test -e "${systemDir}/security3.fdb"; then
cp ${firebird}/security3.fdb "${systemDir}"
fi
if ! test -e "${systemDir}/security4.fdb"; then
cp ${firebird}/security4.fdb "${systemDir}"
fi
chmod -R 700 "${dataDir}" "${systemDir}" /var/log/firebird
'';

11
pkgs/servers/firebird/default.nix
View File

@ -9,7 +9,7 @@ let base = {
changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md";
license = [ "IDPL" "Interbase-1.0" ];
platforms = platforms.linux;
maintainers = with maintainers; [ marcweber ];
maintainers = with maintainers; [ marcweber superherointj ];
};
nativeBuildInputs = [ autoreconfHook ];
@ -29,7 +29,7 @@ let base = {
runHook postInstall
'';
}; in {
}; in rec {
firebird_2_5 = stdenv.mkDerivation (base // rec {
version = "2.5.9";
@ -69,16 +69,17 @@ let base = {
});
firebird_4 = stdenv.mkDerivation (base // rec {
version = "4.0.0-rc1";
version = "4.0.0";
src = fetchFromGitHub {
owner = "FirebirdSQL";
repo = "firebird";
rev = "T4_0_0_RC1";
sha256 = "sha256-FLaRePosF5dtJ+fmrfvzkE6wawC9Z9YLhT/ZWkwWXb4=";
rev = "v${version}";
sha256 = "sha256-a4ex19FMfiJsUEhWUYd2YXKgJ24Jnpoab2t6x9sUuyQ=";
};
buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ];
});
firebird = firebird_4;
}

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

@ -19015,8 +19015,7 @@ in
fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5;
firebird = firebird_3;
inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird;
freeradius = callPackage ../servers/freeradius { };