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 #179711 from pmiddend/fcppt-update-and-metal-removal

Browse source 
fcppt: 3.5.0 -> 4.2.1
This commit is contained in:
Guillaume Girol 2022-07-17 09:02:34 +00:00 committed by GitHub
commit 21d9cb03e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/catch2/default.nix
View file

@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = "http://catch-lib.net";
license = licenses.boost;
maintainers = with maintainers; [ edwtjo knedlsepp ];
platforms = with platforms; unix;
platforms = platforms.unix ++ [ "x86_64-windows" ];
};
}

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

@ -1,19 +1,25 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2, metal }:
{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2 }:
stdenv.mkDerivation rec {
pname = "fcppt";
version = "3.5.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "freundlich";
repo = "fcppt";
rev = version;
sha256 = "045cmn4sym6ria96l4fsc1vrs8l4xrl1gzkmja82f4ddj8qkji2f";
sha256 = "1pcmi2ck12nanw1rnwf8lmyx85iq20897k6daxx3hw5f23j1kxv6";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost catch2 metal ];
buildInputs = [ boost catch2 ];
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=false"
"-DENABLE_BOOST=true"
"-DENABLE_EXAMPLES=true"
"-DENABLE_CATCH=true"
"-DENABLE_TEST=true"
];
meta = with lib; {
description = "Freundlich's C++ toolkit";
@ -27,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = "https://fcppt.org";
license = licenses.boost;
maintainers = with maintainers; [ pmiddend ];
platforms = platforms.linux;
platforms = [ "x86_64-linux" "x86_64-windows" ];
};
}

23
pkgs/development/libraries/metal/default.nix
View file

@ -1,23 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "metal";
version = "2.1.2";
src = fetchFromGitHub {
owner = "brunocodutra";
repo = "metal";
rev = "v${version}";
sha256 = "sha256-1I+EZtIz/2y4+dJGBONhTlUQGHgRdvXc1ZAOC9pmStw=";
};
nativeBuildInputs = [ cmake ];
meta = with 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.all;
};
}

1
pkgs/top-level/aliases.nix
View file

@ -865,6 +865,7 @@ mapAliases ({
mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18
mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
mess = mame; # Added 2019-10-30
metal = throw "metal has been removed due to lack of maintainers";
mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12
midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22
mime-types = mailcap; # Added 2022-01-21

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

@ -14247,7 +14247,6 @@ with pkgs;
coursier = coursier.override { jre = jdk8; };
};
metal = callPackage ../development/libraries/metal { };
metals = callPackage ../development/tools/metals { };
scalafix = callPackage ../development/tools/scalafix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731