commit 9869bbf5bf855a4e0dc01713a14095502f444ba0 · pyrox.dev/nixpkgs

+32 -26

pkgs/development/compilers/ponyc/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pcre2, coreutils, which, openssl, libxml2, cmake, z3, substituteAll, python3,

     

       2
       2
       -
         cc ? stdenv.cc, lto ? !stdenv.isDarwin }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , callPackage

     

       5
       5
       +
       , cc ? stdenv.cc

     

       6
       6
       +
       , cmake

     

       7
       7
       +
       , coreutils

     

       8
       8
       +
       , libxml2

     

       9
       9
       +
       , lto ? !stdenv.isDarwin

     

       10
       10
       +
       , makeWrapper

     

       11
       11
       +
       , openssl

     

       12
       12
       +
       , pcre2

     

       13
       13
       +
       , pony-corral

     

       14
       14
       +
       , python3

     

       15
       15
       +
       , substituteAll

     

       16
       16
       +
       , which

     

       17
       17
       +
       , z3

     

       18
       18
       +
       }:

     

       3
       19
        
       

     

       4
       20
        
       stdenv.mkDerivation (rec {

     

       5
       21
        
         pname = "ponyc";

     

       6
       6
       -
         version = "0.50.0";

     

       22
       22
       +
         version = "0.54.0";

     

       7
       23
        
       

     

       8
       24
        
         src = fetchFromGitHub {

     

       9
       25
        
           owner = "ponylang";

     

       10
       26
        
           repo = pname;

     

       11
       27
        
           rev = version;

     

       12
       12
       -
           sha256 = "sha256-FnzlFTiJrqoUfnys+q9is6OH9yit5ExDiRszQ679QbY=";

     

       13
       13
       -
       

     

       28
       28
       +
           hash = "sha256-qFPubqGfK0WCun6QA1OveyDJj7Wf6SQpky7pEb7qsf4=";

     

       14
       29
        
           fetchSubmodules = true;

     

       15
       30
        
         };

     

       16
       31
        
       

     

       17
       32
        
         ponygbenchmark = fetchFromGitHub {

     

       18
       33
        
           owner = "google";

     

       19
       34
        
           repo = "benchmark";

     

       20
       20
       -
           rev = "v1.5.4";

     

       21
       21
       -
           sha256 = "1dbjdjzkpbsq3jl9ksyg8mw759vkac8qzq1557m73ldnavbhz48x";

     

       35
       35
       +
           rev = "v1.7.1";

     

       36
       36
       +
           hash = "sha256-gg3g/0Ki29FnGqKv9lDTs5oA9NjH23qQ+hTdVtSU+zo=";

     

       22
       37
        
         };

     

       23
       38
        
       

     

       24
       39
        
         nativeBuildInputs = [ cmake makeWrapper which python3 ];

     
···

       32
       47
        
             googletest = fetchFromGitHub {

     

       33
       48
        
               owner = "google";

     

       34
       49
        
               repo = "googletest";

     

       35
       35
       -
               rev = "release-1.10.0";

     

       36
       36
       -
               sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz";

     

       50
       50
       +
               # GoogleTest follows Abseil Live at Head philosophy, use latest commit from main branch as often as possible.

     

       51
       51
       +
               rev = "1a727c27aa36c602b24bf170a301aec8686b88e8"; # unstable-2023-03-07

     

       52
       52
       +
               hash = "sha256-/FWBSxZESwj/QvdNK5BI2EfonT64DP1eGBZR4O8uJww=";

     

       37
       53
        
             };

     

       38
       54
        
           })

     

       39
       39
       -
           (fetchpatch {

     

       40
       40
       -
             name = "remove-decnet-header.patch";

     

       41
       41
       -
             url = "https://github.com/ponylang/ponyc/commit/e5b9b5daec5b19415d519b09954cbd3cf5f34220.patch";

     

       42
       42
       -
             hash = "sha256-60cOhBBwQxWLwEx+svtFtJ7POQkHzJo2LDPRJ5L/bNk=";

     

       43
       43
       -
           })

     

       44
       55
        
         ];

     

       45
       56
        
       

     

       46
       57
        
         postUnpack = ''

     
···

       52
       63
        
         dontConfigure = true;

     

       53
       64
        
       

     

       54
       65
        
         postPatch = ''

     

       55
       55
       -
           # Patching Vendor LLVM

     

       56
       56
       -
           patchShebangs --host build/build_libs/gbenchmark-prefix/src/benchmark/tools/*.py

     

       57
       57
       -
           patch -d lib/llvm/src/ -p1 < lib/llvm/patches/2020-07-28-01-c-exports.diff

     

       58
       66
        
           substituteInPlace packages/process/_test.pony \

     

       59
       67
        
               --replace '"/bin/' '"${coreutils}/bin/' \

     

       60
       68
        
               --replace '=/bin' "${coreutils}/bin"

     
···

       62
       70
        
               --replace "/usr/local/lib" "" \

     

       63
       71
        
               --replace "/opt/local/lib" ""

     

       64
       72
        
         '';

     

       65
       65
       -
       

     

       66
       73
        
       

     

       67
       74
        
         preBuild = ''

     

       68
       75
        
           make libs build_flags=-j$NIX_BUILD_CORES

     
···

       72
       79
        
         makeFlags = [

     

       73
       80
        
           "PONYC_VERSION=${version}"

     

       74
       81
        
           "prefix=${placeholder "out"}"

     

       75
       75
       -
         ]

     

       76
       76
       -
           ++ lib.optionals stdenv.isDarwin [ "bits=64" ]

     

       77
       77
       -
           ++ lib.optionals (stdenv.isDarwin && (!lto)) [ "lto=no" ];

     

       82
       82
       +
         ] ++ lib.optionals stdenv.isDarwin ([ "bits=64" ] ++ lib.optional (!lto) "lto=no");

     

       83
       83
       +
       

     

       84
       84
       +
         env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ];

     

       78
       85
        
       

     

       79
       86
        
         doCheck = true;

     

       80
       80
       -
       

     

       81
       81
       -
         env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ];

     

       82
       87
        
       

     

       83
       88
        
         installPhase = "make config=release prefix=$out "

     

       84
       84
       -
           + lib.optionalString stdenv.isDarwin "bits=64 "

     

       85
       85
       -
           + lib.optionalString (stdenv.isDarwin && (!lto)) "lto=no "

     

       89
       89
       +
           + lib.optionalString stdenv.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no "))

     

       86
       90
        
           + '' install

     

       87
       91
        
           wrapProgram $out/bin/ponyc \

     

       88
       92
        
             --prefix PATH ":" "${stdenv.cc}/bin" \

     
···

       93
       97
        
         # Stripping breaks linking for ponyc

     

       94
       98
        
         dontStrip = true;

     

       95
       99
        
       

     

       100
       100
       +
         passthru.tests.pony-corral = pony-corral;

     

       101
       101
       +
       

     

       96
       102
        
         meta = with lib; {

     

       97
       103
        
           description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";

     

       98
       104
        
           homepage = "https://www.ponylang.org";

     

       99
       105
        
           license = licenses.bsd2;

     

       100
       100
       -
           maintainers = with maintainers; [ kamilchm patternspandemic redvers ];

     

       106
       106
       +
           maintainers = with maintainers; [ kamilchm patternspandemic redvers superherointj ];

     

       101
       107
        
           platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];

     

       102
       108
        
         };

     

       103
       109
        
       })

+21 -10

pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch

···

       1
       1
       +
       From e26ae067644ea780f050fb900bd850027bb86456 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: superherointj <5861043+superherointj@users.noreply.github.com>

     

       3
       3
       +
       Date: Tue, 7 Mar 2023 14:59:31 -0300

     

       4
       4
       +
       Subject: [PATCH] make-safe-for-sandbox.patch

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        lib/CMakeLists.txt | 80 ++--------------------------------------------

     

       8
       8
       +
        1 file changed, 2 insertions(+), 78 deletions(-)

     

       9
       9
       +
       

     

       1
       10
        
       diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt

     

       2
       2
       -
       index dab2aaef..26b587b1 100644

     

       11
       11
       +
       index 129e26e6..d25bdf9d 100644

     

       3
       12
        
       --- a/lib/CMakeLists.txt

     

       4
       13
        
       +++ b/lib/CMakeLists.txt

     

       5
       5
       -
       @@ -36,7 +36,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")

     

       6
       6
       -
        endif()

     

       14
       14
       +
       @@ -32,14 +32,14 @@ endif()

     

       7
       15
        
        

     

       16
       16
       +
        set(PONYC_GBENCHMARK_URL https://github.com/google/benchmark/archive/v1.7.1.tar.gz)

     

       8
       17
        
        ExternalProject_Add(gbenchmark

     

       9
       18
        
       -    URL ${PONYC_GBENCHMARK_URL}

     

       10
       19
        
       +    SOURCE_DIR gbenchmark-prefix/src/benchmark

     

       11
       11
       -
            CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=${PONY_PIC_FLAG} --no-warn-unused-cli

     

       20
       20
       +
            CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_ENABLE_WERROR=OFF -DCMAKE_CXX_FLAGS=${PONY_PIC_FLAG} --no-warn-unused-cli

     

       12
       21
        
        )

     

       13
       22
        
        

     

       14
       14
       -
       @@ -46,7 +46,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")

     

       15
       15
       -
        endif()

     

       23
       23
       +
        set(PONYC_GOOGLETEST_URL https://github.com/google/googletest/archive/release-1.12.1.tar.gz)

     

       16
       24
        
        

     

       17
       25
        
        ExternalProject_Add(googletest

     

       18
       26
        
       -    URL ${PONYC_GOOGLETEST_URL}

     
···

       20
       28
        
            CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=${PONY_PIC_FLAG} -Dgtest_force_shared_crt=ON --no-warn-unused-cli

     

       21
       29
        
        )

     

       22
       30
        
        

     

       23
       23
       -
       @@ -59,82 +59,6 @@ install(TARGETS blake2

     

       31
       31
       +
       @@ -52,82 +52,6 @@ install(TARGETS blake2

     

       24
       32
        
            COMPONENT library

     

       25
       33
        
        )

     

       26
       34
        
        

     

       27
       35
        
       -find_package(Git)

     

       28
       36
        
       -

     

       29
       29
       -
       -set(LLVM_DESIRED_HASH "75e33f71c2dae584b13a7d1186ae0a038ba98838")

     

       30
       30
       -
       -set(PATCHES_DESIRED_HASH "a16f299fbfced16a2bbc628746db341f2a5af9ae8cc9c9ef4b1e9ca26de3c292")

     

       37
       37
       +
       -set(LLVM_DESIRED_HASH "1f9140064dfbfb0bbda8e51306ea51080b2f7aac")

     

       38
       38
       +
       -set(PATCHES_DESIRED_HASH "3e16c097794cb669a8f6a0bd7600b440205ac5c29a6135750c2e83263eb16a95")

     

       31
       39
        
       -

     

       32
       40
        
       -if(GIT_FOUND)

     

       33
       41
        
       -    if(EXISTS "${PROJECT_SOURCE_DIR}/../.git")

     
···

       102
       110
        
       -

     

       103
       111
        
        message("Building targets: ${LLVM_TARGETS_TO_BUILD}")

     

       104
       112
        
        

     

       105
       105
       -
        set(LLVM_ENABLE_BINDINGS OFF)

     

       113
       113
       +
        set(LLVM_ENABLE_BINDINGS OFF CACHE BOOL "ponyc specific override of LLVM cache entry")

     

       114
       114
       +
       -- 

     

       115
       115
       +
       2.39.2

     

       116
       116
       +

+4 -4

pkgs/development/compilers/ponyc/pony-corral.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation ( rec {

     

       8
       8
        
         pname = "corral";

     

       9
       9
       -
         version = "0.6.1";

     

       9
       9
       +
         version = "unstable-2023-02-11";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "ponylang";

     

       13
       13
        
           repo = pname;

     

       14
       14
       -
           rev = "refs/tags/${version}";

     

       15
       15
       -
           hash = "sha256-Rv1K6kFRylWodm1uACBs8KqqEqQZh86NqAG50heNteE=";

     

       14
       14
       +
           rev = "f31353a9ec9cd7eab6ee89079ae6a782192fd4b5";

     

       15
       15
       +
           hash = "sha256-jTx/7iFvmwOdjGVf/6NUy+FTkv6Mkv8DeotJ67pvmtc=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [ ponyc ];

     
···

       24
       24
        
           homepage = "https://www.ponylang.io";

     

       25
       25
        
           changelog = "https://github.com/ponylang/corral/blob/${version}/CHANGELOG.md";

     

       26
       26
        
           license = licenses.bsd2;

     

       27
       27
       -
           maintainers = with maintainers; [ redvers ];

     

       27
       27
       +
           maintainers = with maintainers; [ redvers superherointj ];

     

       28
       28
        
           platforms = [ "x86_64-linux" "x86_64-darwin" ];

     

       29
       29
        
         };

     

       30
       30
        
       })

+2 -2

pkgs/top-level/all-packages.nix

···

       15622
       15622
        
         picat = callPackage ../development/compilers/picat { };

     

       15623
       15623
        
       

     

       15624
       15624
        
         ponyc = callPackage ../development/compilers/ponyc {

     

       15625
       15625
       -
           # Upstream pony has dropped support for versions compiled with gcc.

     

       15626
       15626
       -
           stdenv = llvmPackages_9.stdenv;

     

       15625
       15625
       +
           # Upstream pony no longer supports GCC

     

       15626
       15626
       +
           stdenv = llvmPackages.stdenv;

     

       15627
       15627
        
         };

     

       15628
       15628
        
       

     

       15629
       15629
        
         blaze = callPackage ../development/libraries/blaze { };