git.iko.soy/typeable/nixpkgs
on master help sign in
firebird: 2.5.7 -> 2.5.9, init 3.0.7, init 4.0.0-rc1
commite33dfd47afd8025eb4264c1bf170bccff910f2b8 authorsuperherointj <5861043+superherointj@users.noreply.github.com> dateSun 16 May 2021, 10:29 (6 years ago) parentd0c9638
2 files changed+75−82
pkgs/servers/firebird/default.nix+73−80 pkgs/top-level/all-packages.nix+2−2
pkgs/servers/firebird/default.nix+73−80
@@ -1,91 +1,84 @@
1−{lib, stdenv, fetchurl, libedit, automake, autoconf, libtool
2−,
3− # icu = null: use icu which comes with firebird
4−
5− # icu = pkgs.icu => you may have trouble sharing database files with windows
6− # users if "Collation unicode" columns are being used
7− # windows icu version is *30.dll, however neither the icu 3.0 nor the 3.6
8− # sources look close to what ships with this package.
9− # Thus I think its best to trust firebird devs and use their version
10−
11− # icu version missmatch may cause such error when selecting from a table:
12− # "Collation unicode for character set utf8 is not installed"
13−
14− # icu 3.0 can still be built easily by nix (by dropping the #elif case and
15− # make | make)
16− icu ? null
17−
18−, superServer ? false
19−, port ? 3050
20−, serviceName ? "gds_db"
21−}:
22−
23−/*
24− there are 3 ways to use firebird:
25− a) superserver
26− - one process, one thread for each connection
27− b) classic
28− - is built by default
29− - one process for each connection
30− - on linux direct io operations (?)
31− c) embedded.
32−
33− manual says that you usually don't notice the difference between a and b.
34−
35− I'm only interested in the embedder shared libary for now.
36− So everything isn't tested yet
37−
38−*/
39−
40−stdenv.mkDerivation rec {
41− version = "2.5.7.27050-0";
1+{ lib, stdenv, fetchFromGitHub, libedit, autoreconfHook, zlib, unzip, libtommath, libtomcrypt, icu, superServer ? false }:
2+
3+let base = {
424 pname = "firebird";
435
44− # enableParallelBuilding = false; build fails
6+ meta = with lib; {
7+ description = "SQL relational database management system";
8+ homepage = "https://firebirdsql.org/";
9+ changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md";
10+ license = [ "IDPL" "Interbase-1.0" ];
11+ platforms = platforms.linux;
12+ maintainers = with maintainers; [ marcweber ];
13+ };
14+
15+ nativeBuildInputs = [ autoreconfHook ];
16+
17+ buildInputs = [ libedit icu ];
4518
46− # http://tracker.firebirdsql.org/browse/CORE-3246
47− preConfigure = ''
48− makeFlags="$makeFlags CPU=$NIX_BUILD_CORES"
19+ LD_LIBRARY_PATH = lib.makeLibraryPath [ icu ];
20+
21+ configureFlags = [
22+ "--with-system-editline"
23+ ] ++ (lib.optional superServer "--enable-superserver");
24+
25+ installPhase = ''
26+ runHook preInstall
27+ mkdir -p $out
28+ cp -r gen/Release/firebird/* $out
29+ runHook postInstall
4930 '';
5031
51− configureFlags =
52− [ "--with-serivec-port=${builtins.toString port}"
53− "--with-service-name=${serviceName}"
54− "--with-system-editline"
55− "--with-fblog=/var/log/firebird"
56− "--with-fbconf=/etc/firebird"
57− "--with-fbsecure-db=/var/db/firebird/system"
58− ]
59− ++ (lib.optional (icu != null) "--with-system-icu")
60− ++ (lib.optional superServer "--enable-superserver");
61−
62− src = fetchurl {
63− url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2";
64− sha256 = "06hp6bq5irqvm3h03s79qjgcc3jsjpq150y9aq7anklx9v4nhfqa";
65− };
32+}; in {
6633
67− hardeningDisable = [ "format" ];
34+ firebird_2_5 = stdenv.mkDerivation (base // rec {
35+ version = "2.5.9";
6836
69− # configurePhase = ''
70− # sed -i 's@cp /usr/share/automake-.*@@' autogen.sh
71− # sh autogen.sh $configureFlags --prefix=$out
72− # '';
73− buildInputs = [libedit icu automake autoconf libtool];
37+ src = fetchFromGitHub {
38+ owner = "FirebirdSQL";
39+ repo = "firebird";
40+ rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";
41+ sha256 = "sha256-YyvlMeBux80OpVhsCv+6IVxKXFRsgdr+1siupMR13JM=";
42+ };
7443
75− # TODO: Probably this hase to be tidied up..
76− # make install requires beeing. disabling the root checks
77− # dosen't work. Copying the files manually which can be found
78− # in ubuntu -dev -classic, -example packages:
79− # maybe some of those files can be removed again
80− installPhase = "cp -r gen/firebird $out";
44+ configureFlags = base.configureFlags ++ [ "--with-system-icu" ];
8145
82− meta = {
83− description = "SQL relational database management system";
84− homepage = "https://www.firebirdnews.org";
85− license = ["IDPL" "Interbase-1.0"];
86− maintainers = [lib.maintainers.marcweber];
87− platforms = lib.platforms.linux;
88− broken = true;
89− };
46+ installPhase = ''
47+ runHook preInstall
48+ mkdir -p $out
49+ cp -r gen/firebird/* $out
50+ runHook postInstall
51+ '';
52+
53+ meta = base.meta // { platforms = [ "x86_64-linux" ]; };
54+ });
55+
56+ firebird_3 = stdenv.mkDerivation (base // rec {
57+ version = "3.0.7";
58+
59+ src = fetchFromGitHub {
60+ owner = "FirebirdSQL";
61+ repo = "firebird";
62+ rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";
63+ sha256 = "sha256-8nGan10qjW8dFF89BL/tUWtwMGhahBiODbOqRrHSrbs=";
64+ };
65+
66+ buildInputs = base.buildInputs ++ [ zlib libtommath ];
67+
68+ meta = base.meta // { platforms = [ "x86_64-linux" ]; };
69+ });
70+
71+ firebird_4 = stdenv.mkDerivation (base // rec {
72+ version = "4.0.0-rc1";
73+
74+ src = fetchFromGitHub {
75+ owner = "FirebirdSQL";
76+ repo = "firebird";
77+ rev = "T4_0_0_RC1";
78+ sha256 = "sha256-FLaRePosF5dtJ+fmrfvzkE6wawC9Z9YLhT/ZWkwWXb4=";
79+ };
80+
81+ buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ];
82+ });
9083
9184}
pkgs/top-level/all-packages.nix+2−2
@@ -18775,8 +18775,8 @@ in
1877518775
1877618776 fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
1877718777
18778− firebird = callPackage ../servers/firebird { icu = null; /*stdenv = gcc5Stdenv;*/ };
18779− firebirdSuper = firebird.override { icu = icu58; superServer = true; /*stdenv = gcc5Stdenv;*/ };
18778+ inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5;
18779+ firebird = firebird_3;
1878018780
1878118781 freeradius = callPackage ../servers/freeradius { };
1878218782