Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dabdd7b32959
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a19357241973
Choose a head ref
  • 14 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 27, 2018

  1. add gmic-qt

    nek0 committed Sep 27, 2018
    Copy the full SHA
    49bee19 View commit details

  2. still trying

    nek0 committed Sep 27, 2018

    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
    c26f3ba View commit details

  3. thank you @Mic92

    nek0 committed Sep 27, 2018
    Copy the full SHA
    b199549 View commit details

  4. fixing and cleaning

    nek0 committed Sep 27, 2018
    Copy the full SHA
    04d5ff8 View commit details

  5. final cleaning

    nek0 committed Sep 27, 2018

    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
    24775df View commit details

Commits on Sep 28, 2018

  1. moving stuff around

    nek0 committed Sep 28, 2018
    Copy the full SHA
    059286d View commit details

  2. sokoban

    nek0 committed Sep 28, 2018
    Copy the full SHA
    ac4cfba View commit details

  3. use tags

    nek0 committed Sep 28, 2018
    Copy the full SHA
    6d77f41 View commit details

  4. fix wrong location

    nek0 committed Sep 28, 2018
    Copy the full SHA
    92211c0 View commit details

  5. add clarification

    nek0 committed Sep 28, 2018
    Copy the full SHA
    491a401 View commit details

  6. renaming and restructuring

    nek0 committed Sep 28, 2018
    Copy the full SHA
    b7f2c92 View commit details

  7. fix hash

    nek0 committed Sep 28, 2018
    Copy the full SHA
    6ba1ef4 View commit details

  8. fix CImg dependency

    nek0 committed Sep 28, 2018
    Copy the full SHA
    4303814 View commit details

Commits on Sep 29, 2018

  1. Merge pull request #47442 from nek0/gmic_qt 

    gmic_krita_qt: Init at 2.3.6
    @Mic92
    Mic92 authored Sep 29, 2018
    Copy the full SHA
    a193572 View commit details
Showing with 84 additions and 0 deletions.
  1. +82 −0 pkgs/tools/graphics/gmic_krita_qt/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
82 changes: 82 additions & 0 deletions pkgs/tools/graphics/gmic_krita_qt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig
, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
, curl, krita, qtbase, qttools
, fetchgit }:

let
version = "2.3.6";

in stdenv.mkDerivation rec {
name = "gmic_krita_qt-${version}";

gmic-community = fetchFromGitHub {
owner = "dtschump";
repo = "gmic-community";
rev = "3fd528f20a2a7d651e96078c205ff21efb9cdd1a";
sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2";
};

CImg = fetchgit {
url = "https://framagit.org/dtschump/CImg";
rev = "90f5657d8eab7b549ef945103ef680e747385805";
sha256 = "1af3dwqq18dkw0lz2gvnlw8y0kc1cw01hnc72rf3pg2wyjcp0pvc";
};

gmic_stdlib = fetchurl {
name = "gmic_stdlib.h";
# Version should e in sync with gmic. Basically the version string without dots
url = "http://gmic.eu/gmic_stdlib236.h";
sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q";
};

gmic = fetchFromGitHub {
owner = "dtschump";
repo = "gmic";
rev = "v.${version}";
sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";
};

gmic_qt = fetchFromGitHub {
owner = "c-koi";
repo = "gmic-qt";
rev = "v.${version}";
sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";
};

unpackPhase = ''
cp -r ${gmic} gmic
ln -s ${gmic-community} gmic-community
cp -r ${gmic_qt} gmic_qt
chmod -R +w gmic gmic_qt
ln -s ${CImg} CImg
cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
cd gmic_qt
'';

preConfigure = ''
make -C ../gmic/src CImg.h gmic_stdlib.h
'';

nativeBuildInputs = [ cmake pkgconfig ];

buildInputs = [
qtbase qttools fftw zlib libjpeg libtiff libpng
opencv openexr graphicsmagick curl krita
];

cmakeFlags = [ "-DGMIC_QT_HOST=krita" ];

installPhase = ''
mkdir -p $out/bin;
install -Dm755 gmic_krita_qt "$out/bin/gmic_krita_qt"
'';

meta = with stdenv.lib; {
description = "Krita plugin for the G'MIC image processing framework";
homepage = http://gmic.eu/;
license = licenses.gpl3;
platforms = platforms.unix;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1370,6 +1370,8 @@ with pkgs;

gmic = callPackage ../tools/graphics/gmic { };

gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { };

goa = callPackage ../development/tools/goa {
buildGoPackage = buildGo110Package;
};