Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 810909de3e33
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5897b9563f0c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 2, 2020

  1. jwasm: 2017-11-12 -> 2.13

    @AndersonTorres @alyssais
    AndersonTorres authored and alyssais committed Apr 2, 2020
    Copy the full SHA
    5897b95 View commit details
Showing with 11 additions and 5 deletions.
  1. +11 −5 pkgs/development/compilers/jwasm/default.nix
16 changes: 11 additions & 5 deletions pkgs/development/compilers/jwasm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,24 +2,30 @@
, cmake }:

with stdenv.lib;
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "jwasm";
version = "git-2017-11-22";
version = "2.13";

src = fetchFromGitHub {
owner = "JWasm";
repo = "JWasm";
rev = "26f97c8b5c9d9341ec45538701116fa3649b7766";
rev = version;
sha256 = "0m972pc8vk8s9yv1pi85fsjgm6hj24gab7nalw2q04l0359nqi7w";
};

nativeBuildInputs = [ cmake ];

installPhase = "mkdir -p $out/bin ; cp jwasm $out/bin/";
installPhase = ''
install -Dpm755 jwasm -t $out/bin/
install -Dpm644 $src/History.txt $src/Readme.txt \
$src/Doc/enh.txt $src/Doc/fixes.txt \
$src/Doc/gencode.txt $src/Doc/overview.txt \
-t $out/share/doc/jwasm/
'';

meta = {
description = "A MASM-compatible x86 assembler";
homepage = http://jwasm.github.io/;
homepage = "http://jwasm.github.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.darwin ++ platforms.linux;