public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34426 from andir/libyamlcpp

Browse Source 
WIP: libyaml-cpp: 0.5.3 -> 0.6.1
This commit is contained in:
Andreas Rammhold 2018-02-13 16:43:40 +01:00 committed by GitHub
commit 122fa75b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
View File

@ -145,5 +145,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ taeer olynch ]; maintainers = with maintainers; [ taeer olynch ];
platforms = platforms.linux; platforms = platforms.linux;
# pjsip' fails to compile with the supplied patch set, see: https://hydra.nixos.org/build/68667921/nixlog/4
broken = true;
}; };
} }

12
pkgs/development/libraries/libyaml-cpp/default.nix
View File

@ -2,28 +2,26 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libyaml-cpp-${version}"; name = "libyaml-cpp-${version}";
version = "0.5.3"; version = "0.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jbeder"; owner = "jbeder";
repo = "yaml-cpp"; repo = "yaml-cpp";
rev = "release-${version}"; rev = "yaml-cpp-${version}";
sha256 = "0qr286q8mwbr4cxz0y0rf045zc071qh3cb804by6w1ydlqciih8a"; sha256 = "16x53p9gfch7gpyg865j7m1zhqsixx2hbbd206ffjv0ip8cjipjf";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
buildInputs = [ cmake boost ]; nativeBuildInputs = [ cmake ];
cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; cmakeFlags = "-DBUILD_SHARED_LIBS=ON";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;
description = "A YAML parser and emitter for C++"; description = "A YAML parser and emitter for C++";
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ andir ];
}; };
} }

22
pkgs/games/openxcom/default.nix
View File

@ -1,22 +1,18 @@
{stdenv, fetchurl, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost {stdenv, fetchFromGitHub, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost
, SDL, SDL_image, SDL_mixer, SDL_gfx }: , SDL, SDL_image, SDL_mixer, SDL_gfx }:
let version = "1.0.0"; in let version = "1.0.0.2018.01.28"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "openxcom-${version}"; name = "openxcom-${version}";
src = fetchurl { src = fetchFromGitHub {
url = http://openxcom.org/file/1726/; owner = "SupSuper";
sha256 = "1rmg10nklvf86ckbbssyvbg5cd4p7in5zq3mas2yyffdjk9i40v6"; repo = "OpenXcom";
name = "openxcom-${version}.tar.gz"; rev = "b148916268a6ce104c3b6b7eb4d9e0487cba5487";
sha256 = "1128ip3g4aw59f3f23mvlyhl8xckhwjjw9rd7wn7xv51hxdh191c";
}; };
buildInputs = [ cmake mesa zlib openssl libyamlcpp boost nativeBuildInputs = [ cmake ];
SDL SDL_image SDL_mixer SDL_gfx ]; buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp mesa openssl zlib ];
patches = [ (fetchpatch {
url = "https://github.com/SupSuper/OpenXcom/commit/49bec0851fc6e5365cac0f71b2c40a80ddf95e77.patch";
sha256 = "156fk8wz4qc0nmqq3zjb6kw84qirabads2azr6xvlgb3lcn327v2";
}) ];
meta = { meta = {
description = "Open source clone of UFO: Enemy Unknown"; description = "Open source clone of UFO: Enemy Unknown";

6
pkgs/tools/inputmethods/interception-tools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcppWithoutBoost, { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp,
libevdev, libudev }: libevdev, libudev }:
let let
@ -12,8 +12,8 @@ in stdenv.mkDerivation {
sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j"; sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ cmake libevdev libudev libyamlcppWithoutBoost ]; buildInputs = [ libevdev libudev libyamlcpp ];
prePatch = '' prePatch = ''
substituteInPlace CMakeLists.txt --replace \ substituteInPlace CMakeLists.txt --replace \

17
pkgs/top-level/all-packages.nix
View File

@ -10180,23 +10180,6 @@ with pkgs;
}; };
}); });
# interception-tools needs this. This should be removed when there is a new
# release of libyamlcpp, i.e. when the version of libyamlcpp is newer than
# 0.5.3.
libyamlcppWithoutBoost = libyamlcpp.overrideAttrs (oldAttrs: rec {
name = "libyaml-cpp-${version}";
version = "2017-08-25";
src = fetchFromGitHub {
owner = "jbeder";
repo = "yaml-cpp";
rev = "beb44b872c07c74556314e730c6f20a00b32e8e5";
sha256 = "1qkr3i5lin6m36w5rbimc7pjx3nx686xnjb6lw00xf67iqrl4h4m";
};
buildInputs = [ cmake ];
});
libykneomgr = callPackage ../development/libraries/libykneomgr { }; libykneomgr = callPackage ../development/libraries/libykneomgr { };
libytnef = callPackage ../development/libraries/libytnef { }; libytnef = callPackage ../development/libraries/libytnef { };