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: 507eaf61cb62
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 26006395f615
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 10, 2019

  1. ocamlPackages.cairo2: 0.6 -> 0.6.1

    @vbgl
    vbgl committed May 10, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    GPG key ID: EBD582ADDDB1F81F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    20359e5 View commit details

  2. ocamlPackages.lablgtk3: 3.0.beta5 -> 3.0.beta6

    @vbgl
    vbgl committed May 10, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    GPG key ID: EBD582ADDDB1F81F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a625f19 View commit details

Commits on May 11, 2019

  1. Merge pull request #61233 from vbgl/ocaml-cairo-0.6.1 

    ocamlPackages.cairo2: 0.6 -> 0.6.1; ocamlPackages.lablgtk3: 3.0.beta5 -> 3.0.beta6
    @c0bw3b
    c0bw3b authored May 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2600639 View commit details
Showing with 7 additions and 9 deletions.
  1. +2 −2 pkgs/development/ocaml-modules/cairo2/default.nix
  2. +5 −7 pkgs/development/ocaml-modules/lablgtk3/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/cairo2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

buildDunePackage rec {
pname = "cairo2";
version = "0.6";
version = "0.6.1";

src = fetchurl {
url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
sha256 = "1k2q7ipmddqnd2clybj4qb5xwzzrnl2fxnd6kv60dlzgya18lchs";
sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i";
};

nativeBuildInputs = [ pkgconfig ];
12 changes: 5 additions & 7 deletions pkgs/development/ocaml-modules/lablgtk3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{ lib, fetchFromGitHub, pkgconfig, buildDunePackage, gtk3, cairo2 }:
{ lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }:

buildDunePackage rec {
version = "3.0.beta5";
version = "3.0.beta6";
pname = "lablgtk3";

minimumOCamlVersion = "4.05";

src = fetchFromGitHub {
owner = "garrigue";
repo = "lablgtk";
rev = version;
sha256 = "05n3pjy4496gbgxwbypfm2462njv6dgmvkcv26az53ianpwa4vzz";
src = fetchurl {
url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz";
sha256 = "1jni5cbp54qs7y0dc5zkm28v2brpfwy5miighv7cy0nmmxrsq520";
};

nativeBuildInputs = [ pkgconfig ];