ophis: refactor

- get rid of python3Packages.callPackage
- get rid of rec
- fix version format

+38 -26
+37 -25
pkgs/development/compilers/ophis/default.nix
··· 1 - { lib, buildPythonApplication, fetchFromGitHub }: 1 + { 2 + lib, 3 + fetchFromGitHub, 4 + python3Packages, 5 + unstableGitUpdater, 6 + }: 2 7 3 - buildPythonApplication rec { 4 - pname = "ophis"; 5 - version = "unstable-2019-04-13"; 8 + let 9 + self = python3Packages.buildPythonApplication { 10 + pname = "ophis"; 11 + version = "0-unstable-2019-04-13"; 6 12 7 - src = fetchFromGitHub { 8 - owner = "michaelcmartin"; 9 - repo = "Ophis"; 10 - rev = "99f074da278d4ec80689c0e22e20c5552ea12512"; 11 - sha256 = "2x8vwLTSngqQqmVrVh/mM4peATgaRqOSwrfm5XCkg/g="; 12 - }; 13 + src = fetchFromGitHub { 14 + owner = "michaelcmartin"; 15 + repo = "Ophis"; 16 + rev = "99f074da278d4ec80689c0e22e20c5552ea12512"; 17 + hash = "sha256-2x8vwLTSngqQqmVrVh/mM4peATgaRqOSwrfm5XCkg/g="; 18 + }; 13 19 14 - sourceRoot = "${src.name}/src"; 20 + sourceRoot = "${self.src.name}/src"; 15 21 16 - meta = with lib; { 17 - homepage = "http://michaelcmartin.github.io/Ophis/"; 18 - description = "Cross-assembler for the 6502 series of microprocessors"; 19 - mainProgram = "ophis"; 20 - longDescription = '' 21 - Ophis is an assembler for the 6502 microprocessor - the famous chip used 22 - in the vast majority of the classic 8-bit computers and consoles. Its 23 - primary design goals are code readability and output flexibility - Ophis 24 - has successfully been used to create programs for the Nintendo 25 - Entertainment System, the Atari 2600, and the Commodore 64. 26 - ''; 27 - license = licenses.mit; 28 - maintainers = with maintainers; [ AndersonTorres ]; 22 + passthru = { 23 + updateScript = unstableGitUpdater { }; 24 + }; 25 + 26 + meta = { 27 + homepage = "http://michaelcmartin.github.io/Ophis/"; 28 + description = "Cross-assembler for the 6502 series of microprocessors"; 29 + longDescription = '' 30 + Ophis is an assembler for the 6502 microprocessor - the famous chip used 31 + in the vast majority of the classic 8-bit computers and consoles. Its 32 + primary design goals are code readability and output flexibility - Ophis 33 + has successfully been used to create programs for the Nintendo 34 + Entertainment System, the Atari 2600, and the Commodore 64. 35 + ''; 36 + license = lib.licenses.mit; 37 + mainProgram = "ophis"; 38 + maintainers = with lib.maintainers; [ AndersonTorres ]; 39 + }; 29 40 }; 30 - } 41 + in 42 + self
+1 -1
pkgs/top-level/all-packages.nix
··· 4647 4647 4648 4648 ophcrack-cli = ophcrack.override { enableGui = false; }; 4649 4649 4650 - ophis = python3Packages.callPackage ../development/compilers/ophis { }; 4650 + ophis = callPackage ../development/compilers/ophis { }; 4651 4651 4652 4652 open-interpreter = with python3Packages; toPythonApplication open-interpreter; 4653 4653