Merge master into staging-next
This commit is contained in:
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
|
||||
description = "A linear logic programming language for modeling generative interactive systems";
|
||||
homepage = "https://github.com/chrisamaphone/interactive-lp";
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = with platforms; linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.sharedlibrary \
|
||||
--replace 'gcc' '${stdenv.cc.targetPrefix}cc' \
|
||||
--replace 'g++' '${stdenv.cc.targetPrefix}c++'
|
||||
substituteInPlace Makefile.cmdline \
|
||||
--replace 'gcc' '${stdenv.cc.targetPrefix}cc' \
|
||||
--replace 'g++' '${stdenv.cc.targetPrefix}c++'
|
||||
'';
|
||||
buildPhase = ''
|
||||
make -f Makefile.sharedlibrary
|
||||
make -f Makefile.cmdline
|
||||
@@ -27,6 +35,6 @@ stdenv.mkDerivation rec {
|
||||
downloadPage = "https://duktape.org/download.html";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.fgaz ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tinyscheme";
|
||||
version = "1.41";
|
||||
version = "1.42";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tinyscheme/${pname}-${version}.tar.gz";
|
||||
sha256 = "168rk4zrlhsknbvldq2jsgabpwlqkx6la44gkqmijmf7jhs11h7a";
|
||||
sha256 = "sha256-F7Cxv/0i89SdWDPiKhILM5A50s/aC0bW/FHdLwG0B60=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
Reference in New Issue
Block a user