diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-20 22:06:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-20 22:06:25 +0000 |
| commit | 599a2238386b6f1f293f888d068122b46e1bde23 (patch) | |
| tree | 0067a2d1c791f83c3cfe8e372730da8c40ce1f6a | |
| parent | f6ae7c5a016f2d1ca27d827f77f4899825a60621 (diff) | |
| download | nixpkgs-599a2238386b6f1f293f888d068122b46e1bde23.tar nixpkgs-599a2238386b6f1f293f888d068122b46e1bde23.tar.gz nixpkgs-599a2238386b6f1f293f888d068122b46e1bde23.tar.bz2 nixpkgs-599a2238386b6f1f293f888d068122b46e1bde23.tar.lz nixpkgs-599a2238386b6f1f293f888d068122b46e1bde23.tar.xz nixpkgs-599a2238386b6f1f293f888d068122b46e1bde23.tar.zst nixpkgs-599a2238386b6f1f293f888d068122b46e1bde23.zip | |
z88dk: init at unstable-2018-02-20 (#35244)
fixes #35039
| -rw-r--r-- | lib/licenses.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/z88dk/default.nix | 50 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 57 insertions, 0 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index e03ed38eb5e..03af13b990e 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -99,6 +99,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = ''BSD 4-clause "Original" or "Old" License''; }; + clArtistic = spdx { + spdxId = "ClArtistic"; + fullName = "Clarified Artistic License"; + }; + cc0 = spdx { spdxId = "CC0-1.0"; fullName = "Creative Commons Zero v1.0 Universal"; diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix new file mode 100644 index 00000000000..1590075dc2a --- /dev/null +++ b/pkgs/development/compilers/z88dk/default.nix @@ -0,0 +1,50 @@ +{ fetchFromGitHub, fetchpatch, stdenv, makeWrapper, unzip, libxml2, m4, uthash }: + +stdenv.mkDerivation rec { + name = "z88dk-${version}"; + version = "20180217"; + rev = "49a7c6032b2675af742f5b0b3aa5bd5260bdd814"; + short_rev = "${builtins.substring 0 7 rev}"; + + src = fetchFromGitHub { + owner = "z88dk"; + repo = "z88dk"; + inherit rev; + sha256 = "00vbklh6lkq1gyd08ig2vcg6c1mghvlwfx3vq3wldf34hcs3k4pp"; + }; + + # https://github.com/z88dk/z88dk/pull/612 + patches = [(fetchpatch { + url = "https://github.com/Mic92/z88dk/commit/5b4ca132fa1f31c9ac48cf2220358715739ca0b2.patch"; + sha256 = "1p2l31j68p7jzykhkhd9iagn2lr08hdclk3cl9l32p1q6ghdipfv"; + })]; + + postPatch = '' + # we dont rely on build.sh : + export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite + export ZCCCFG=$PWD/lib/config/ + ''; + + makeFlags = [ + "prefix=$(out)" + "git_rev=${short_rev}" + "version=${version}" + "git_count=0" + ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ libxml2 m4 uthash ]; + + preInstall = '' + mkdir -p $out/{bin,share} + ''; + + installTargets = "libs install"; + + meta = with stdenv.lib; { + homepage = https://www.z88dk.org; + description = "z80 Development Kit"; + license = licenses.clArtistic; + maintainers = [ maintainers.genesis ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cea45a1430..8d5f797bc0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6762,6 +6762,8 @@ with pkgs; yosys = callPackage ../development/compilers/yosys { }; + z88dk = callPackage ../development/compilers/z88dk { }; + zulu8 = callPackage ../development/compilers/zulu/8.nix { }; zulu9 = callPackage ../development/compilers/zulu { }; zulu = zulu9; |