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: d47eb666b1eb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c4c006f02809
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 4, 2020

  1. icon-lang: 9.5.1 -> 9.5.20i

    @deviant
    deviant committed Sep 4, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f6f3baf View commit details

Commits on Nov 26, 2020

  1. Merge pull request #97081 from deviant/update-icon-lang 

    icon-lang: 9.5.1 -> 9.5.20i
    @SuperSandro2000
    SuperSandro2000 authored Nov 26, 2020
    Copy the full SHA
    c4c006f View commit details
Showing with 19 additions and 27 deletions.
  1. +19 −27 pkgs/development/interpreters/icon-lang/default.nix
46 changes: 19 additions & 27 deletions pkgs/development/interpreters/icon-lang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,37 @@
{ stdenv, fetchFromGitHub, fetchpatch, libX11, libXt, withGraphics ? true }:
{ stdenv, fetchFromGitHub
, libX11, libXt
, withGraphics ? true
}:

stdenv.mkDerivation rec {
pname = "icon-lang";
version = "9.5.1";
version = "9.5.20i";

src = fetchFromGitHub {
owner = "gtownsend";
repo = "icon";
rev = "rel${builtins.replaceStrings ["."] [""] version}";
sha256 = "1gkvj678ldlr1m5kjhx6zpmq11nls8kxa7pyy64whgakfzrypynw";
rev = "v${version}";
sha256 = "0072b3jk8mc94w818z8bklhjdf9rf0d9a7lkvw40pz3niy7zv84s";
};

buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ];

patches = [
# Patch on git master, likely won't be necessary in future release
(fetchpatch {
url = "https://github.com/gtownsend/icon/commit/bfc4a6004d0d3984c8066289b8d8e563640c4ddd.patch";
sha256 = "1pqapjghk10rb73a1mfflki2wipjy4kvnravhmrilkqzb9hd6v8m";
excludes = [
"doc/relnotes.htm"
"src/h/version.h"
];
})
];

configurePhase =
let
_name = if stdenv.isDarwin then "macintosh" else "linux";
in
''
make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name}
'';
configurePhase = let
target = if withGraphics then "X-Configure" else "Configure";
platform = if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "macintosh"
else if stdenv.isBSD then "bsd"
else if stdenv.isCygwin then "cygwin"
else if stdenv.isSunOS then "solaris"
else throw "unsupported system";
in "make ${target} name=${platform}";

installPhase = ''
make Install dest=$out
'';
installPhase = "make Install dest=$out";

meta = with stdenv.lib; {
description = ''A very high level general-purpose programming language'';
maintainers = with maintainers; [ vrthra yurrriq ];
platforms = with platforms; linux ++ darwin;
platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos;
license = licenses.publicDomain;
homepage = "https://www.cs.arizona.edu/icon/";
};