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: ea46c3a51bb2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ee0929b0ba24
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 15, 2020

  1. cimg: 2.8.4 -> 2.9.0

    @AndersonTorres
    AndersonTorres committed Apr 15, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b818fb1 View commit details

  2. Merge pull request #84275 from AndersonTorres/update-cimg 

    cimg: 2.8.4 -> 2.9.0
    @AndersonTorres
    AndersonTorres authored Apr 15, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    ee0929b View commit details
Showing with 13 additions and 7 deletions.
  1. +13 −7 pkgs/development/libraries/cimg/default.nix
20 changes: 13 additions & 7 deletions pkgs/development/libraries/cimg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {
pname = "cimg";
version = "2.8.4";
version = "2.9.0";

src = fetchurl {
url = "http://cimg.eu/files/CImg_${version}.zip";
sha256 = "1y4j2dmk4nnc5rx65c2px7r0nfq5117pmqpvi7klp9wmgcjs29gf";
src = fetchFromGitHub {
owner = "dtschump";
repo = "CImg";
rev = "v.${version}";
sha256 = "1x43c1w2kzr6h3j7y3kwiwb7nba0iymck6bq9psvp53mh9xxrfd1";
};

nativeBuildInputs = [ unzip ];

installPhase = ''
install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "A small, open source, C++ toolkit for image processing";
longDescription = ''
CImg stands for Cool Image. It is easy to use, efficient and is intended
to be a very pleasant toolbox to design image processing algorithms in
C++. Due to its generic conception, it can cover a wide range of image
processing applications.
'';
homepage = "http://cimg.eu/";
license = licenses.cecill-c;
maintainers = [ maintainers.AndersonTorres ];