Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

1 files changed, 8 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/development/libraries/odpic/default.nix b/nixpkgs/pkgs/development/libraries/odpic/default.nix
index a89f0b2cc101..aee255fd9612 100644
--- a/nixpkgs/pkgs/development/libraries/odpic/default.nix
+++ b/nixpkgs/pkgs/development/libraries/odpic/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
 
 let
-  version = "4.6.1";
+  version = "5.0.0";
   libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
 
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
   inherit version;
 
   pname = "odpic";
@@ -13,7 +14,7 @@ in stdenv.mkDerivation {
     owner = "oracle";
     repo = "odpi";
     rev = "v${version}";
-    sha256 = "sha256-3kJI3qRgqrithhGq7lO1r94T/P3SamDgLN13hKzmj5I=";
+    sha256 = "sha256-ZRkXd7D4weCfP6R7UZD2+saNiNa+XXVhfiWIlxBObmU=";
   };
 
   nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
@@ -22,7 +23,7 @@ in stdenv.mkDerivation {
     ++ lib.optionals stdenv.isLinux [ libaio ];
 
   dontPatchELF = true;
-  makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc"];
+  makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ];
 
   postFixup = ''
     ${lib.optionalString (stdenv.isLinux) ''
@@ -31,14 +32,14 @@ in stdenv.mkDerivation {
     ${lib.optionalString (stdenv.isDarwin) ''
       install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
     ''}
-    '';
+  '';
 
   meta = with lib; {
     description = "Oracle ODPI-C library";
     homepage = "https://oracle.github.io/odpi/";
-    maintainers = with maintainers; [ mkazulak flokli ];
+    maintainers = with maintainers; [ mkazulak ];
     license = licenses.asl20;
     platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
-    hydraPlatforms = [];
+    hydraPlatforms = [ ];
   };
 }