Merge master into staging-next
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dasm";
|
||||
version = "2.20.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dasm-assembler";
|
||||
repo = "dasm";
|
||||
rev = version;
|
||||
sha256 = "1nr4kvw42vyc6i4p1c06jlih11rhbjjxc27dc7cx5qj635xf4jcf";
|
||||
};
|
||||
|
||||
configurePhase = false;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install bin/* $out/bin
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs ./test/
|
||||
'';
|
||||
|
||||
checkTarget = "test";
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Assembler for 6502 and other 8-bit microprocessors";
|
||||
homepage = "https://dasm-assembler.github.io";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.jwatt ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -24,13 +24,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-graphics-compiler";
|
||||
version = "1.0.3627";
|
||||
version = "1.0.4062";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-graphics-compiler";
|
||||
rev = "igc-${version}";
|
||||
sha256 = "1x9fjvf7rbhil09am2v9j2jhwysdvwgshf9zidbirjgfrqn573h8";
|
||||
sha256 = "1fr9mb7s5f0kiwxf04lqbyqbxfsvki0kwnpcy41m3p3la22mqz47";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ clang cmake bison flex llvm python ];
|
||||
|
||||
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
|
||||
|
||||
propagatedBuildInputs = [glib];
|
||||
|
||||
configureFlags = [
|
||||
"--x-includes=${libX11.dev}/include"
|
||||
"--x-libraries=${libX11.out}/lib"
|
||||
|
||||
@@ -18,19 +18,19 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "purescript";
|
||||
version = "0.13.6";
|
||||
version = "0.13.8";
|
||||
|
||||
src =
|
||||
if stdenv.isDarwin
|
||||
then
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
|
||||
sha256 = "04kwjjrriyizpvhs96jgyx21ppyd1ynblk24i5825ywxlw9hja25";
|
||||
sha256 = "058w8w24g7xbdkn5l97jfj9dcg81vkfh3w8112anj982lynk6391";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
|
||||
sha256 = "012znrj32aq96qh1g2hscdvhl3flgihhimiz40agk0dykpksblns";
|
||||
sha256 = "01xb9sl6rmg02ypdrv4n0mkzmdr5y9rajcdmg9c3j46q7z6q9mxy";
|
||||
};
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "A strongly-typed functional programming language that compiles to JavaScript";
|
||||
homepage = "https://www.purescript.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ];
|
||||
maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rgbds";
|
||||
version = "0.3.10";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rednex";
|
||||
repo = "rgbds";
|
||||
rev = "v${version}";
|
||||
sha256 = "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq";
|
||||
sha256 = "15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7";
|
||||
};
|
||||
nativeBuildInputs = [ bison flex pkg-config libpng ];
|
||||
installFlags = [ "PREFIX=\${out}" ];
|
||||
|
||||
Reference in New Issue
Block a user