Merge pull request #319852 from atorres1985-contrib/jwasm (34105c6b) · Commits · nix / nixpkgs

pkgs/development/compilers/jwasm/default.nix→pkgs/by-name/jw/jwasm/package.nix

+11 −10

Original line number	Diff line number	Diff line
		{ 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;
		};
		})

+0 −2

Original line number	Diff line number	Diff line
		@@ -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 { };