summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkgs/servers/firebird/default.nix11
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index fa3a8d022983..074481f35187 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -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;
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cbb4e447884..9ba5b09adc23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18980,8 +18980,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 { };