Merge pull request #319852 from atorres1985-contrib/jwasm

jwasm: 2.17 -> 2.18
This commit is contained in:
Peder Bergebakken Sundt 2024-06-19 21:00:10 +02:00 committed by GitHub
commit 34105c6b2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 12 deletions

View File

@ -1,17 +1,18 @@
{ lib
, stdenv
, fetchFromGitHub
{
lib,
fetchFromGitHub,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "jwasm";
version = "2.17";
version = "2.18";
src = fetchFromGitHub {
owner = "Baron-von-Riedesel";
repo = "JWasm";
rev = "v${finalAttrs.version}";
hash = "sha256-22eNtHXF+RQT4UbXIVjn1JP/s6igp5O1oQT7sVl7c1U=";
hash = "sha256-xbiyGBTzIkAfUy45JdAl77gbvArzVUQNPOxa+H2uGFo=";
};
outputs = [ "out" "doc" ];
@ -31,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
-t $doc/share/doc/jwasm/
'';
meta = with lib; {
meta = {
homepage = "https://github.com/Baron-von-Riedesel/JWasm/";
description = "MASM-compatible x86 assembler";
changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/v${finalAttrs.version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/${finalAttrs.src.rev}";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
broken = stdenv.isDarwin;
};
})

View File

@ -16134,8 +16134,6 @@ with pkgs;
julia-stable-bin = julia_110-bin;
julia-bin = julia-stable-bin;
jwasm = callPackage ../development/compilers/jwasm { };
kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { };
kingstvis = callPackage ../applications/science/electronics/kingstvis { };