diff --git a/pkgs/by-name/or/oracle-instantclient/package.nix b/pkgs/by-name/or/oracle-instantclient/package.nix index 6cd1c5d2829a4..da5397115b71b 100644 --- a/pkgs/by-name/or/oracle-instantclient/package.nix +++ b/pkgs/by-name/or/oracle-instantclient/package.nix @@ -15,7 +15,7 @@ assert odbcSupport -> unixodbc != null; let - inherit (lib) optional optionals optionalString; + inherit (lib) optional optionalString; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -31,18 +31,18 @@ let # determine the version number, there might be different ones per architecture version = { - x86_64-linux = "21.10.0.0.0"; - aarch64-linux = "19.10.0.0.0"; - x86_64-darwin = "19.8.0.0.0"; + x86_64-linux = "23.26.1.0.0"; + aarch64-linux = "23.26.1.0.0"; + x86_64-darwin = "19.16.0.0.0"; aarch64-darwin = "23.3.0.23.09"; } .${stdenv.hostPlatform.system} or throwSystem; directory = { - x86_64-linux = "2110000"; - aarch64-linux = "191000"; - x86_64-darwin = "198000"; + x86_64-linux = "2326100"; + aarch64-linux = "2326100"; + x86_64-darwin = "1916000"; aarch64-darwin = "233023"; } .${stdenv.hostPlatform.system} or throwSystem; @@ -51,25 +51,25 @@ let hashes = { x86_64-linux = { - basic = "sha256-uo0QBOmx7TQyroD+As60IhjEkz//+0Cm1tWvLI3edaE="; - sdk = "sha256-TIBFi1jHLJh+SUNFvuL7aJpxh61hG6gXhFIhvdPgpts="; - sqlplus = "sha256-mF9kLjhZXe/fasYDfmZrYPL2CzAp3xDbi624RJDA4lM="; - tools = "sha256-ay8ynzo1fPHbCg9GoIT5ja//iZPIZA2yXI/auVExiRY="; - odbc = "sha256-3M6/cEtUrIFzQay8eHNiLGE+L0UF+VTmzp4cSBcrzlk="; + basic = "sha256-1nFeQEo1s6U4KAt4329+5Z2oOp02tZYhj9JkBR25d/M="; + sdk = "sha256-LX747BTD4CQCIWIMEs6U0EcJLJBlFx2xd3jM57H91ds="; + sqlplus = "sha256-Oi9t4B0iTkPcN4YJR7piNPAgBdryn8zUe4vBCGYZjkk="; + tools = "sha256-34pyUxx7ubgTrTCqtHOIPMGg7baS1lCUuCgnBRbYR30="; + odbc = "sha256-e8RaAWSNvI0QQABV7t7rO58Vn26jnwe6IsaxSpPAZtM="; }; aarch64-linux = { - basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY="; - sdk = "sha256-8VpkNyLyFMUfQwbZpSDV/CB95RoXfaMr8w58cRt/syw="; - sqlplus = "sha256-iHcyijHhAvjsAqN9R+Rxo2R47k940VvPbScc2MWYn0Q="; - tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M="; - odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms="; + basic = "sha256-Gsvr+LfnCBcf78ZhKmpmhFXn6J7HVloqcjps91QGCvI="; + sdk = "sha256-LEziVUysVWPwSwc2iiEMcN1GtLM8r1R0rns4tXvroaA="; + sqlplus = "sha256-LxgsfrLy93hY9dzvne6IE3XGM4d03UFkos/EFv9664o="; + tools = "sha256-RU4J4zDZ9nAg8Q0zt2u37Mw02/rXaMjG5cg5r4lMqck="; + odbc = "sha256-fRo46haK5IVT+Y/kCzvP0hGCI9m//RTKHcF5/Gfz2Eo="; }; x86_64-darwin = { - basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc="; - sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw="; - sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk="; - tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU="; - odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY="; + basic = "sha256-cl7rfAAEHpJrV8PbUI6nQ5oZNaN/SAwKxtRu3cQgUzE="; + sdk = "sha256-DO4/x8xCfZUDcHRZua3QzBRrgMNIeUCrYjG9yrcCoOs="; + sqlplus = "sha256-1KIZviC2YNq21TBigKJDbpfH6W5578/T/BR6MkQaaX0="; + tools = "sha256-s7j6FGWzLM1f6O1zVuCxaDvOiolZHNJxVzSPu8G4/Bo="; + odbc = "sha256-9+eMK3RFZUehUKSY+lkAUE10EgQgev9E5/z6ASVbO6A="; }; aarch64-darwin = { basic = "sha256-G83bWDhw9wwjLVee24oy/VhJcCik7/GtKOzgOXuo1/4="; @@ -112,9 +112,10 @@ let suffix = { + x86_64-darwin = "dbru.dmg"; aarch64-darwin = ".dmg"; } - .${stdenv.hostPlatform.system} or "dbru.zip"; + .${stdenv.hostPlatform.system} or ".zip"; # calculate the filename of a single zip file srcFilename = @@ -162,7 +163,11 @@ stdenv.mkDerivation { "lib" ]; - unpackCmd = if isDarwinAarch64 then "7zz x $curSrc -aoa -oinstantclient" else "unzip $curSrc"; + unpackCmd = + if isDarwinAarch64 then + "7zz x $curSrc -aoa -oinstantclient -x!META-INF" + else + "unzip $curSrc -x 'META-INF/*'"; installPhase = '' mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} $lib/lib