commit 21d9cb03e625948d310b86ecde0f0d5d9c5b23a3 · pyrox.dev/nixpkgs

+1 -1

pkgs/development/libraries/catch2/default.nix

···

       20
       20
        
           homepage = "http://catch-lib.net";

     

       21
       21
        
           license = licenses.boost;

     

       22
       22
        
           maintainers = with maintainers; [ edwtjo knedlsepp ];

     

       23
       23
       -
           platforms = with platforms; unix;

     

       23
       23
       +
           platforms = platforms.unix ++ [ "x86_64-windows" ];

     

       24
       24
        
         };

     

       25
       25
        
       }

+12 -6

pkgs/development/libraries/fcppt/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, boost, catch2, metal }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, boost, catch2 }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
        
         pname = "fcppt";

     

       4
       4
       -
         version = "3.5.0";

     

       4
       4
       +
         version = "4.2.1";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "freundlich";

     

       8
       8
        
           repo = "fcppt";

     

       9
       9
        
           rev = version;

     

       10
       10
       -
           sha256 = "045cmn4sym6ria96l4fsc1vrs8l4xrl1gzkmja82f4ddj8qkji2f";

     

       10
       10
       +
           sha256 = "1pcmi2ck12nanw1rnwf8lmyx85iq20897k6daxx3hw5f23j1kxv6";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ cmake ];

     

       14
       14
       -
         buildInputs = [ boost catch2 metal ];

     

       14
       14
       +
         buildInputs = [ boost catch2 ];

     

       15
       15
        
       

     

       16
       16
       -
         cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ];

     

       16
       16
       +
         cmakeFlags = [

     

       17
       17
       +
           "-DCMAKE_SKIP_BUILD_RPATH=false"

     

       18
       18
       +
           "-DENABLE_BOOST=true"

     

       19
       19
       +
           "-DENABLE_EXAMPLES=true"

     

       20
       20
       +
           "-DENABLE_CATCH=true"

     

       21
       21
       +
           "-DENABLE_TEST=true"

     

       22
       22
       +
         ];

     

       17
       23
        
       

     

       18
       24
        
         meta = with lib; {

     

       19
       25
        
           description = "Freundlich's C++ toolkit";

     
···

       27
       33
        
           homepage = "https://fcppt.org";

     

       28
       34
        
           license = licenses.boost;

     

       29
       35
        
           maintainers = with maintainers; [ pmiddend ];

     

       30
       30
       -
           platforms = platforms.linux;

     

       36
       36
       +
           platforms = [ "x86_64-linux" "x86_64-windows" ];

     

       31
       37
        
         };

     

       32
       38
        
       }

-23

pkgs/development/libraries/metal/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake }:

     

       2
       2
       -
       stdenv.mkDerivation rec {

     

       3
       3
       -
         pname = "metal";

     

       4
       4
       -
         version = "2.1.2";

     

       5
       5
       -
       

     

       6
       6
       -
         src = fetchFromGitHub {

     

       7
       7
       -
           owner = "brunocodutra";

     

       8
       8
       -
           repo = "metal";

     

       9
       9
       -
           rev = "v${version}";

     

       10
       10
       -
           sha256 = "sha256-1I+EZtIz/2y4+dJGBONhTlUQGHgRdvXc1ZAOC9pmStw=";

     

       11
       11
       -
         };

     

       12
       12
       -
       

     

       13
       13
       -
         nativeBuildInputs = [ cmake ];

     

       14
       14
       -
       

     

       15
       15
       -
         meta = with lib; {

     

       16
       16
       -
           description = "Single-header C++11 library designed to make you love template metaprogramming";

     

       17
       17
       -
           homepage = "https://github.com/brunocodutra/metal";

     

       18
       18
       -
           license = licenses.mit;

     

       19
       19
       -
           maintainers = with maintainers; [ pmiddend ];

     

       20
       20
       -
           platforms = platforms.all;

     

       21
       21
       -
         };

     

       22
       22
       -
       

     

       23
       23
       -
       }

+1

pkgs/top-level/aliases.nix

···

       865
       865
        
         mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18

     

       866
       866
        
         mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15

     

       867
       867
        
         mess = mame; # Added 2019-10-30

     

       868
       868
       +
         metal = throw "metal has been removed due to lack of maintainers";

     

       868
       869
        
         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

     

       869
       870
        
         midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22

     

       870
       871
        
         mime-types = mailcap; # Added 2022-01-21

-1

pkgs/top-level/all-packages.nix

···

       14247
       14247
        
           coursier = coursier.override { jre = jdk8; };

     

       14248
       14248
        
         };

     

       14249
       14249
        
       

     

       14250
       14250
       -
         metal = callPackage ../development/libraries/metal { };

     

       14251
       14250
        
         metals = callPackage ../development/tools/metals { };

     

       14252
       14251
        
         scalafix = callPackage ../development/tools/scalafix {

     

       14253
       14252
        
           jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731