diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-07-08 04:38:15 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-07-08 04:38:15 -0400 |
| commit | 280e629ee061460b95850c5bb4cdbfa0836a49bd (patch) | |
| tree | 6ea3716a4d526d5a7508b8eeca916baff5719222 /pkgs/development/compilers | |
| parent | 15c347a2983d7d636c1ad8fb77632a1ede7a013b (diff) | |
| parent | 44188d64727f056e1596b89019cda5b92eb0b368 (diff) | |
| download | nixpkgs-280e629ee061460b95850c5bb4cdbfa0836a49bd.tar nixpkgs-280e629ee061460b95850c5bb4cdbfa0836a49bd.tar.gz nixpkgs-280e629ee061460b95850c5bb4cdbfa0836a49bd.tar.bz2 nixpkgs-280e629ee061460b95850c5bb4cdbfa0836a49bd.tar.lz nixpkgs-280e629ee061460b95850c5bb4cdbfa0836a49bd.tar.xz nixpkgs-280e629ee061460b95850c5bb4cdbfa0836a49bd.tar.zst nixpkgs-280e629ee061460b95850c5bb4cdbfa0836a49bd.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/compilers')
3 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 36a83d47d6f..086d4d30127 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.41.1"; + version = "0.42.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "02wx070cy1193xzv58vh79yzwgpqiayqlwd3i285698fppbcg69a"; + sha256 = "1s8glmzz0g5lj1fjwwy4m3n660smiq5wl9r1lg686wqh42hcgnsy"; # Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched # LLVM. (The submodule is a specific tag in the LLVM source tree). diff --git a/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch index 49addcbc616..8190cc2ee02 100644 --- a/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch +++ b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch @@ -1,21 +1,21 @@ ---- a/lib/CMakeLists.txt 2021-05-27 15:58:36.819331229 -0400 -+++ b/lib/CMakeLists.txt 2021-05-27 16:00:19.768268649 -0400 -@@ -10,12 +10,12 @@ +--- a/lib/CMakeLists.txt.orig 2021-07-07 13:40:20.209410160 -0400 ++++ a/lib/CMakeLists.txt 2021-07-07 13:43:11.886969662 -0400 +@@ -15,12 +15,12 @@ endif() ExternalProject_Add(gbenchmark -- URL https://github.com/google/benchmark/archive/v1.5.2.tar.gz -+ SOURCE_DIR gbenchmark-prefix/src/benchmark +- URL ${PONYC_GBENCHMARK_URL} ++ SOURCE_DIR gbenchmark-prefix/src/benchmark CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=-fpic --no-warn-unused-cli ) ExternalProject_Add(googletest - URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz -+ URL @googletest@ ++ URL @googletest@ CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=-fpic -Dgtest_force_shared_crt=ON --no-warn-unused-cli ) -@@ -28,75 +28,6 @@ +@@ -33,75 +33,6 @@ COMPONENT library ) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 568407c3614..adf9dd13c71 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.14.2"; + version = "0.14.3"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1ga2hn9br71dyzn3p9jvjiksvnq21p6i5hp1z1j5fpz9la28nqzf"; + sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1kv7dm1nw85lw3brrclkj7xc9p021jx3n8wgp2fg3572s86ypskw"; + sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0"; }; |