Merge branch 'staging' into make-perl-pathd
This commit is contained in:
@@ -3,14 +3,14 @@
|
||||
|
||||
let
|
||||
pname = "d-feet";
|
||||
version = "0.3.13";
|
||||
version = "0.3.14";
|
||||
in python3Packages.buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/d-feet/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1md3lzs55sg04ds69dbginpxqvgg3qnf1lfx3vmsxph6bbd2y6ll";
|
||||
sha256 = "1m8lwiwl5jhi0x7y6x5zmd3hjplgvdjrb8a8jg74rvkygslj1p7f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, expect, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dejagnu-1.6.1";
|
||||
name = "dejagnu-1.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/dejagnu/${name}.tar.gz";
|
||||
sha256 = "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz";
|
||||
sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd";
|
||||
};
|
||||
|
||||
buildInputs = [ expect makeWrapper ];
|
||||
|
||||
@@ -9,14 +9,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dialog-${version}";
|
||||
version = "1.3-20180621";
|
||||
version = "1.3-20181107";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/dialog/${name}.tgz"
|
||||
"https://invisible-mirror.net/archives/dialog/${name}.tgz"
|
||||
];
|
||||
sha256 = "0yjqczlf64yppgvk4i6s0jm06mdr0mb5m6sj39nf891dnbi5jj2a";
|
||||
sha256 = "0mv4a31sz5kc1hyc51cvg9dq54vhlz0vbizn7jgkm9fx4y0cmspg";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv
|
||||
|
||||
# Build time
|
||||
, fetchurl, fetchpatch, pkgconfig, perl, texinfo, setupDebugInfoDirs
|
||||
, fetchurl, fetchpatch, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages
|
||||
|
||||
# Run time
|
||||
, ncurses, readline, gmp, mpfr, expat, zlib, dejagnu
|
||||
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# darwin build fails with format hardening since v7.12
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
install -Dm755 bin/premake $out/bin/premake
|
||||
'';
|
||||
|
||||
premake_cmd = "premake3";
|
||||
premake_cmd = "premake";
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = {
|
||||
|
||||
Reference in New Issue
Block a user