MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #84880 from pmiddend/fcppt-to-3.5.0

Browse source 
fcppt: 3.2.2 -> 3.5.0
This commit is contained in:
Benjamin Hipple 2020-04-11 11:55:09 -04:00 committed by GitHub
commit 7b1f4dc454
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/fcppt/default.nix
View file

@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, cmake, boost, brigand, catch2 }: { stdenv, fetchFromGitHub, cmake, boost, catch2, metal }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fcppt"; pname = "fcppt";
version = "3.2.2"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "freundlich"; owner = "freundlich";
repo = "fcppt"; repo = "fcppt";
rev = version; rev = version;
sha256 = "09mah52m3lih2n0swpsh8qb72yzl4nixaq99xp7wxyxxprhf4bpa"; sha256 = "045cmn4sym6ria96l4fsc1vrs8l4xrl1gzkmja82f4ddj8qkji2f";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ boost catch2 ]; buildInputs = [ boost catch2 metal ];
cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" "-DBrigand_INCLUDE_DIR=${brigand}/include" ]; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ];
enableParallelBuilding = true; enableParallelBuilding = true;

25
pkgs/development/libraries/metal/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "metal";
version = "2.1.1";
src = fetchFromGitHub {
owner = "brunocodutra";
repo = "metal";
rev = "v${version}";
sha256 = "07n1aqyaixbd66l24km5ip3pkmidkx9m3saygf7cfp6vvbgmi42l";
};
nativeBuildInputs = [ cmake ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Single-header C++11 library designed to make you love template metaprogramming";
homepage = "https://github.com/brunocodutra/metal";
license = licenses.mit;
maintainers = with maintainers; [ pmiddend ];
platforms = platforms.linux;
};
}

1
pkgs/top-level/all-packages.nix
View file

@ -9040,6 +9040,7 @@ in
scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; };
scala = scala_2_13; scala = scala_2_13;
metal = callPackage ../development/libraries/metal { };
metals = callPackage ../development/tools/metals { }; metals = callPackage ../development/tools/metals { };
scalafix = callPackage ../development/tools/scalafix { }; scalafix = callPackage ../development/tools/scalafix { };
scalafmt = callPackage ../development/tools/scalafmt { }; scalafmt = callPackage ../development/tools/scalafmt { };