Merge branch 'master' into staging

This commit is contained in:
Shea Levy
2018-03-24 01:34:53 -04:00
141 changed files with 2752 additions and 1454 deletions
+2 -2
View File
@@ -8,13 +8,13 @@
, libXmu
}:
let
version = "0.25.0";
version = "0.26.2";
in
gsmakeDerivation {
name = "gnustep-back-${version}";
src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz";
sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2";
sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cairo base gui freetype x11 libXmu ];
+2 -2
View File
@@ -11,13 +11,13 @@
, pkgconfig, portaudio
}:
let
version = "1.24.9";
version = "1.25.1";
in
gsmakeDerivation {
name = "gnustep-base-${version}";
src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz";
sha256 = "1vvjlbqmlwr82b4pf8c62rxjgz475bmg0x2yd0bbkia6yvwhk585";
sha256 = "17mnilg28by74wc08nkwp6gi06x3j2nrcf05wg64nrw5ljffp2zj";
};
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [
+2 -2
View File
@@ -1,13 +1,13 @@
{ fetchurl, base, back, gsmakeDerivation, gui }:
let
version = "1.2.22";
version = "1.2.23";
in
gsmakeDerivation {
name = "gorm-${version}";
src = fetchurl {
url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz";
sha256 = "1mq5n65xd9bc4kppx19iijsgpz4crvhg7bfwbi9k78j159vclnmi";
sha256 = "18pf9vvzvdk8bg4lhjb96y1kdkmb9ahmvrqv2581vn45pjxmmlnb";
};
buildInputs = [ base back gui ];