diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix index 7d83624e8415..bda3653eb0d7 100644 --- a/pkgs/development/compilers/xa/dxa.nix +++ b/pkgs/development/compilers/xa/dxa.nix @@ -4,14 +4,14 @@ , installShellFiles }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dxa"; version = "0.1.5"; src = fetchurl { urls = [ - "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" - "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/dxa-${self.version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/unsupported/dxa-${self.version}.tar.gz" ]; hash = "sha256-jkDtd4FlgfmtlaysLtaaL7KseFDkM9Gc1oQZOkWCZ5k="; }; @@ -27,17 +27,18 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -d $out/bin/ - install dxa $out/bin/ + + install -Dm755 -T dxa $out/bin/dxa installManPage dxa.1 + runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://www.floodgap.com/retrotech/xa/"; description = "Andre Fachat's open-source 6502 disassembler"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix index db719c8fd23f..9f4d45ba4977 100644 --- a/pkgs/development/compilers/xa/xa.nix +++ b/pkgs/development/compilers/xa/xa.nix @@ -4,16 +4,16 @@ , perl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "xa"; - version = "2.3.13"; + version = "2.3.14"; src = fetchurl { urls = [ - "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" - "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/xa-${self.version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${self.version}.tar.gz" ]; - hash = "sha256-qUd68VC2yKkc09QeHPjJ31UtODMmSVV2gwJxykRnvYY="; + hash = "sha256-G5u6vdvY07lBC4UuUKEo7qQeaBM55vdsPoB2+lQg8C4="; }; nativeCheckInputs = [ perl ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { patchShebangs tests ''; - meta = with lib; { + meta = { homepage = "https://www.floodgap.com/retrotech/xa/"; description = "Andre Fachat's open-source 6502 cross assembler"; longDescription = '' @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { suite, as well as "bare" plain binary object files - block structure for label scoping ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = with lib.platforms; unix; }; -} +})