Unverified Commit 4847c1a0 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

firebird_3: 3.0.13 -> 3.0.14; firebird_4: 4.0.6 -> 4.0.7; firebird_5: init at 5.0.4 (#511515)

parents 5ae1451d 64984288

pkgs/servers/firebird/default.nix

+36 −5
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
  fetchDebianPatch,

  libedit,

  autoreconfHook,

  cmake,

  zlib,

  unzip,

  libtommath,
@@ -48,6 +49,9 @@ let 


    enableParallelBuilding = true;



    __structuredAttrs = true;

    strictDeps = true;



    installPhase = ''

      runHook preInstall

      mkdir -p $out
@@ -62,13 +66,13 @@ rec { 
  firebird_3 = stdenv.mkDerivation (

    base

    // rec {

      version = "3.0.13";

      version = "3.0.14";



      src = fetchFromGitHub {

        owner = "FirebirdSQL";

        repo = "firebird";

        rev = "v${version}";

        hash = "sha256-ti3cFfByM2wxOLkAebwtFe25B5W7jOwi3f7MPYo/yUA=";

        hash = "sha256-X6Jv32VniAefIWjLTPwEipsQVRl7HBb4EKyi2IL1VWM=";

      };



      patches = [
@@ -95,13 +99,13 @@ rec { 
  firebird_4 = stdenv.mkDerivation (

    base

    // rec {

      version = "4.0.6";

      version = "4.0.7";



      src = fetchFromGitHub {

        owner = "FirebirdSQL";

        repo = "firebird";

        rev = "v${version}";

        hash = "sha256-65wfG6huDzvG/tEVllA58OfZqoL4U/ilw5YIDqQywTs=";

        hash = "sha256-EnD0cTQSOh1fARjKdoOCR5UjpvVA96EZVVWfqlH+m48=";

      };



      nativeBuildInputs = base.nativeBuildInputs ++ [ unzip ];
@@ -113,5 +117,32 @@ rec { 
    }

  );



  firebird = firebird_4;

  firebird_5 = stdenv.mkDerivation (

    base

    // rec {

      version = "5.0.4";



      src = fetchFromGitHub {

        owner = "FirebirdSQL";

        repo = "firebird";

        rev = "v${version}";

        hash = "sha256-wAiOyCVS7fjVqrDlJJwDFxw5ZD5spnXlYKCAQ8gctHI=";

      };



      # CMake is just used for libcds

      dontUseCmakeConfigure = true;



      nativeBuildInputs = base.nativeBuildInputs ++ [

        cmake

        unzip

      ];

      buildInputs = base.buildInputs ++ [

        zlib

        libtommath

        libtomcrypt

      ];

    }

  );



  firebird = firebird_5;

}

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -8004,6 +8004,7 @@ with pkgs; 
  dovecot_pigeonhole_2_4 = dovecot_pigeonhole;



  inherit (callPackages ../servers/firebird { })

    firebird_5

    firebird_4

    firebird_3

    firebird