git.iko.soy/typeable/nixpkgs
on master help sign in
gegl: update URL to HTTPS
commit852d2a3af95508ee9612d1cbe2224b3fb24f315d authorAndersonTorres <torres.anderson.85@protonmail.com> dateSat 24 Oct 2020, 12:58 (6 years ago) parent0f0a6ee
2 files changed+26−13
pkgs/development/libraries/gegl/4.0.nix+4−4 pkgs/development/libraries/gegl/default.nix+22−9
pkgs/development/libraries/gegl/4.0.nix+4−4
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242
4343 src = fetchurl {
4444 url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
45− sha256 = "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg";
45+ sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ=";
4646 };
4747
4848 patches = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83
5151 (fetchpatch {
5252 url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch";
53− sha256 = "CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
53+ sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
5454 })
5555 ];
5656
@@ -120,8 +120,8 @@ stdenv.mkDerivation rec {
120120
121121 meta = with stdenv.lib; {
122122 description = "Graph-based image processing framework";
123− homepage = "http://www.gegl.org";
124− license = licenses.gpl3;
123+ homepage = "https://www.gegl.org";
124+ license = licenses.lgpl3Plus;
125125 maintainers = with maintainers; [ jtojnar ];
126126 platforms = platforms.unix;
127127 };
pkgs/development/libraries/gegl/default.nix+22−9
@@ -1,12 +1,24 @@
1−{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg
2−, librsvg, pango, gtk2, bzip2, intltool, libintl
1+{ stdenv
2+, fetchurl
3+, pkgconfig
4+, babl
5+, libpng
6+, cairo
7+, libjpeg
8+, librsvg
9+, pango
10+, gtk2
11+, bzip2
12+, intltool
13+, libintl
314, OpenGL ? null }:
415
516stdenv.mkDerivation rec {
6− name = "gegl-0.2.0";
17+ pname = "gegl";
18+ version = "0.2.0";
719
820 src = fetchurl {
9− url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2";
21+ url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2";
1022 sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
1123 };
1224
@@ -17,7 +29,7 @@ stdenv.mkDerivation rec {
1729 name = "CVE-2012-4433.patch";
1830 })];
1931
20− # needs fonts otherwise don't know how to pass them
32+ # needs fonts otherwise don't know how to pass them
2133 configureFlags = [ "--disable-docs" ];
2234
2335 buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
@@ -27,10 +39,11 @@ stdenv.mkDerivation rec {
2739
2840 doCheck = false; # fails 3 out of 19 tests
2941
30− meta = {
42+ meta = with stdenv.lib; {
3143 description = "Graph-based image processing framework";
32− homepage = "http://www.gegl.org";
33− license = stdenv.lib.licenses.gpl3;
34− platforms = stdenv.lib.platforms.unix;
44+ homepage = "https://www.gegl.org";
45+ license = licenses.lgpl3Plus;
46+ maintainers = with maintainers; [ jtojnar ];
47+ platforms = platforms.unix;
3548 };
3649}