diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-13 22:22:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-13 22:22:06 +0100 |
commit | afbf0c4fe7b0b6be04e31567a9334ae25bef9577 (patch) | |
tree | 92dbc63fb280def89d82a3bf8916e64a5231832a /pkgs | |
parent | e6af8b5d8c682786cbcc3e4ec6021abcbb429e04 (diff) | |
parent | b13a6b6791def7d50931015db6413f11c85262ab (diff) | |
download | nixlib-afbf0c4fe7b0b6be04e31567a9334ae25bef9577.tar nixlib-afbf0c4fe7b0b6be04e31567a9334ae25bef9577.tar.gz nixlib-afbf0c4fe7b0b6be04e31567a9334ae25bef9577.tar.bz2 nixlib-afbf0c4fe7b0b6be04e31567a9334ae25bef9577.tar.lz nixlib-afbf0c4fe7b0b6be04e31567a9334ae25bef9577.tar.xz nixlib-afbf0c4fe7b0b6be04e31567a9334ae25bef9577.tar.zst nixlib-afbf0c4fe7b0b6be04e31567a9334ae25bef9577.zip |
Merge pull request #48321 from c0bw3b/pkg/guile-cairo
guile-cairo: 1.4.1 -> 1.10.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/guile-modules/guile-cairo/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 32a22566bdb1..4bd49b06796d 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { name = "guile-cairo-${version}"; - version = "1.4.1"; + version = "1.10.0"; src = fetchurl { - url = "http://download.gna.org/guile-cairo/${name}.tar.gz"; - sha256 = "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x"; + url = "mirror://savannah/guile-cairo/${name}.tar.gz"; + sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile cairo expat ]; - checkInputs = [ guile-lib ]; + enableParallelBuilding = true; doCheck = true; + checkInputs = [ guile-lib ]; meta = with stdenv.lib; { description = "Cairo bindings for GNU Guile"; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment. ''; - homepage = "http://home.gna.org/guile-cairo/"; + homepage = https://www.nongnu.org/guile-cairo/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2b38e80b041..8f5659ccb864 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7943,9 +7943,7 @@ with pkgs; jython = callPackage ../development/interpreters/jython {}; - guile-cairo = callPackage ../development/guile-modules/guile-cairo { - guile = guile_2_0; - }; + guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; |