diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/nanodbc | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nanodbc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/nanodbc/default.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nanodbc/default.nix b/nixpkgs/pkgs/development/libraries/nanodbc/default.nix index 64f362e35202..7fca00c1d459 100644 --- a/nixpkgs/pkgs/development/libraries/nanodbc/default.nix +++ b/nixpkgs/pkgs/development/libraries/nanodbc/default.nix @@ -1,16 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, unixODBC }: +{ lib, stdenv, fetchFromGitHub, catch2, cmake, unixODBC }: stdenv.mkDerivation rec { pname = "nanodbc"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "nanodbc"; repo = "nanodbc"; rev = "v${version}"; - sha256 = "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm"; + hash = "sha256-dVUOwA7LfLqcQq2nc6OAha0krmgTy5RUHupBVrNdo4g="; }; + postPatch = '' + cp ${catch2}/include/catch2/catch.hpp test/catch/catch.hpp + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ unixODBC ]; @@ -20,15 +24,6 @@ stdenv.mkDerivation rec { else [ "-DBUILD_SHARED_LIBS=ON" ]; - # fix compilation on macOS - # https://github.com/nanodbc/nanodbc/issues/274 - # remove after the next version update - postUnpack = if stdenv.isDarwin then '' - mv $sourceRoot/VERSION $sourceRoot/VERSION.txt - substituteInPlace $sourceRoot/CMakeLists.txt \ - --replace 'file(STRINGS VERSION' 'file(STRINGS VERSION.txt' - '' else ""; - meta = with lib; { homepage = "https://github.com/nanodbc/nanodbc"; changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md"; |