Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2019-01-22 15:59:42 +01:00
266 changed files with 5298 additions and 2613 deletions
+2 -2
View File
@@ -8,13 +8,13 @@
, libXmu
}:
let
version = "0.26.2";
version = "0.27.0";
in
gsmakeDerivation {
name = "gnustep-back-${version}";
src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz";
sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf";
sha256 = "0j400892ysxygh50i3918nn87vkxh15h892jwvphmkd34j8wdn9f";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ];
+2 -2
View File
@@ -1,12 +1,12 @@
{ gsmakeDerivation, fetchurl, base }:
let
version = "0.26.2";
version = "0.27.0";
in
gsmakeDerivation {
name = "gnustep-gui-${version}";
src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz";
sha256 = "1dsbkifnjha3ghq8xx55bpsbbng0cjsni3yz71r7342ax2ixcvxc";
sha256 = "1m6k3fa2ndxv0kl2fazi76mwa27gn5jyp24q0rk96f2djhsy94br";
};
buildInputs = [ base ];
patches = [ ./fixup-all.patch ];