diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/yaml-cpp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix index c9468b10b99b..20d546e346b8 100644 --- a/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix @@ -3,36 +3,19 @@ , fetchFromGitHub , gitUpdater , cmake -, fetchpatch }: stdenv.mkDerivation rec { pname = "yaml-cpp"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; - rev = "yaml-cpp-${version}"; - hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; + rev = version; + hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI="; }; - patches = [ - # https://github.com/jbeder/yaml-cpp/issues/774 - # https://github.com/jbeder/yaml-cpp/pull/1037 - (fetchpatch { - name = "yaml-cpp-Fix-generated-cmake-config.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; - hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; - }) - # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available - (fetchpatch { - name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; - hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -47,9 +30,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - passthru.updateScript = gitUpdater { - rev-prefix = "yaml-cpp-"; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A YAML parser and emitter for C++"; |