Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 20aeed3ba808
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 209ab53069e8
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 2, 2019

  1. ponyc: 0.26.0 -> 0.27.0 

    https://www.ponylang.io/blog/2019/03/0.27.0-released/
    @dtzWill
    dtzWill committed Mar 2, 2019
    Copy the full SHA
    a30a76e View commit details

  2. pony-stable: 0.1.6 -> 0.2.0

    @dtzWill
    dtzWill committed Mar 2, 2019
    Copy the full SHA
    7565289 View commit details

  3. ponyc: use llvm7, this is last version supporting llvm_39 

    Pinning ponyc to use llvm_39 was done way back in 2016[1]
and shows no indication that this was done for any reason
other than specifying what ponyc supported at the time :).

[1] ae4ef90
    @dtzWill
    dtzWill committed Mar 2, 2019
    Copy the full SHA
    2688a23 View commit details

  4. ponyc: cleanup a bit, mostly remove old source fixups no longer needed

    @dtzWill
    dtzWill committed Mar 2, 2019
    Copy the full SHA
    aba8801 View commit details

Commits on Mar 4, 2019

  1. Merge pull request #56670 from dtzWill/update/pony-0.27.0 

    ponyc: 0.26.0 -> 0.27.0, cleanup, use recent LLVM
    @dtzWill
    dtzWill authored Mar 4, 2019
    Copy the full SHA
    209ab53 View commit details
Showing with 8 additions and 22 deletions.
  1. +4 −16 pkgs/development/compilers/ponyc/default.nix
  2. +3 −5 pkgs/development/compilers/ponyc/pony-stable.nix
  3. +1 −1 pkgs/top-level/all-packages.nix
20 changes: 4 additions & 16 deletions pkgs/development/compilers/ponyc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.26.0";
version = "0.27.0";

src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "1k1ysqk7j8kpysndps2ic9hprvp0z0d32d6jvqlapjrfccghy7dh";
sha256 = "11vdfvv9xirfi92y7zza9pqimfx33w74vw7rg5n7l60qqc8y2cla";
};

buildInputs = [ llvm makeWrapper which ];
@@ -25,25 +25,15 @@ stdenv.mkDerivation ( rec {
substituteInPlace packages/process/_test.pony \
--replace '=/bin' "${coreutils}/bin"
# Fix llvm-ar check for darwin
substituteInPlace Makefile \
--replace "llvm-ar-3.8" "llvm-ar"
# Remove impure system refs
substituteInPlace src/libponyc/pkg/package.c \
--replace "/usr/local/lib" ""
substituteInPlace src/libponyc/pkg/package.c \
--replace "/usr/local/lib" "" \
--replace "/opt/local/lib" ""
for file in `grep -irl '/usr/local/opt/libressl/lib' ./*`; do
substituteInPlace $file --replace '/usr/local/opt/libressl/lib' "${stdenv.lib.getLib libressl}/lib"
done
# Fix ponypath issue
substituteInPlace Makefile \
--replace "PONYPATH=." "PONYPATH=.:\$(PONYPATH)"
export LLVM_CONFIG=${llvm}/bin/llvm-config
'' + stdenv.lib.optionalString ((!stdenv.isDarwin) && (!cc.isClang) && lto) ''
export LTO_PLUGIN=`find ${cc.cc}/ -name liblto_plugin.so`
@@ -73,9 +63,7 @@ stdenv.mkDerivation ( rec {
wrapProgram $out/bin/ponyc \
--prefix PATH ":" "${stdenv.cc}/bin" \
--set-default CC "$CC" \
--prefix PONYPATH : "$out/lib" \
--prefix PONYPATH : "${stdenv.lib.getLib pcre2}/lib" \
--prefix PONYPATH : "${stdenv.lib.getLib libressl}/lib"
--prefix PONYPATH : "${stdenv.lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}"
'';

# Stripping breaks linking for ponyc
8 changes: 3 additions & 5 deletions pkgs/development/compilers/ponyc/pony-stable.nix
View file
Original file line number Diff line number Diff line change
@@ -2,20 +2,18 @@

stdenv.mkDerivation rec {
name = "pony-stable-${version}";
version = "0.1.6";
version = "0.2.0";

src = fetchFromGitHub {
owner = "ponylang";
repo = "pony-stable";
rev = version;
sha256 = "02lqba75psnxcxj2y8lm1fy1hmwa088nvxjghhpnlkqbwz7wa2sw";
sha256 = "0zzcq0vsl6kcrsxwqzd3s9mq7aq5sg8si5c83rxyi9n6a06gnbh7";
};

buildInputs = [ ponyc ];

installPhase = ''
make prefix=$out install
'';
installFlags = [ "prefix=${placeholder "out"}" "install" ];

meta = {
description = "A simple dependency manager for the Pony language.";
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7512,7 +7512,7 @@ in
};

ponyc = callPackage ../development/compilers/ponyc {
llvm = llvm_39;
llvm = llvm_7;
};

pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { };