Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6af8b5d8c68
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: afbf0c4fe7b0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 13, 2018

  1. guile-cairo: 1.4.1 -> 1.10.0

    @c0bw3b
    c0bw3b committed Oct 13, 2018
    Copy the full SHA
    b13a6b6 View commit details

  2. Merge pull request #48321 from c0bw3b/pkg/guile-cairo 

    guile-cairo: 1.4.1 -> 1.10.0
    @Mic92
    Mic92 authored Oct 13, 2018
    Copy the full SHA
    afbf0c4 View commit details
Showing with 7 additions and 8 deletions.
  1. +6 −5 pkgs/development/guile-modules/guile-cairo/default.nix
  2. +1 −3 pkgs/top-level/all-packages.nix
11 changes: 6 additions & 5 deletions pkgs/development/guile-modules/guile-cairo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };