public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-11-27 15:09:19 +01:00
parent 9778483751 be36f6f0a0
commit b2a3891e12
800 changed files with 21489 additions and 5337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/development/interpreters/icon-lang/default.nix
View File

@@ -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
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}";
configurePhase =
let
_name = if stdenv.isDarwin then "macintosh" else "linux";
in
''
make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name}
'';
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/";
};

6
pkgs/development/interpreters/metamath/default.nix
View File

@@ -2,15 +2,15 @@
stdenv.mkDerivation {
pname = "metamath";
version = "0.182";
version = "0.193";
buildInputs = [ autoreconfHook ];
src = fetchFromGitHub {
owner = "metamath";
repo = "metamath-exe";
rev = "5df616efe4119ff88daf77e7041d45b6fa39c578";
sha256 = "0amjdgy42c7jypf6sz98iczlxcyl9bqx67ws1q8w2zdqk2izsyjp";
rev = "f973c81222ebe36580a24f0fa7bbb600990af7d6";
sha256 = "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b";
};
meta = with stdenv.lib; {

4
pkgs/development/interpreters/php/7.3.nix
View File

@@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "7.3.24";
sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm";
version = "7.3.25";
sha256 = "1yq2fwpg9jgcafcrq4ffqm52r0f80pi6zy7fj1yb1qwim96mlcb9";
# https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

4
pkgs/development/interpreters/php/7.4.nix
View File

@@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "7.4.12";
sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf";
version = "7.4.13";
sha256 = "1nhzldjp8jfd1hivfyn5wydim5daibz0vkfxgys2xj8igs2kk8qm";
});
in base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/interpreters/rakudo/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
version = "2020.10";
version = "2020.11";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
sha256 = "0wvsinmpz8icd0409f8rg93mqdb5ml76m0vb4r26ngz237ph69dn";
sha256 = "107sskgf0p6npm3vjpv5wrqgfa007af6bxxiv1wgiyzx7maqdw5n";
};
buildInputs = [ icu zlib gmp perl ];

4
pkgs/development/interpreters/rakudo/moarvm.nix
View File

@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
version = "2020.10";
version = "2020.11";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
sha256 = "1i7jjjwv4av3rsfgbqb213fhb9ns25jfm19nzn7kki0n7w486y33";
sha256 = "1163zv1fglgwbk6pppzbjwcgzpp13ilg5cz7fawsfnzdnrrq40kd";
};
buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];

4
pkgs/development/interpreters/rakudo/nqp.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
version = "2020.10";
version = "2020.11";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
sha256 = "0nb0vdycz2wrd5yspvps2wy7a21066csr18v786085qim347830h";
sha256 = "03whmlc6bmwmwrddwd5vqmir0gzwnmf0apvl2q1na09qqj3zb1br";
};
buildInputs = [ perl ];

4
pkgs/development/interpreters/unicon-lang/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, libX11, libXt }:
{ stdenv, fetchurl, unzip, libX11, libXt, libnsl }:
stdenv.mkDerivation {
pname = "unicon-lang";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
url = "http://unicon.org/dist/uni-2-4-2010.zip";
sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61";
};
buildInputs = [ libX11 libXt unzip ];
buildInputs = [ libnsl libX11 libXt unzip ];
hardeningDisable = [ "fortify" ];