From 42b08b743c6de17f706c2fdf766d67ad0786bfe8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 25 Sep 2016 08:44:26 -0400
Subject: [PATCH] openjpeg: 2.1.0 -> 2.1.1 for critical bugfixes and no ABI
break
---
pkgs/development/libraries/openjpeg/1.x.nix | 5 +++--
pkgs/development/libraries/openjpeg/2.0.nix | 5 +++--
pkgs/development/libraries/openjpeg/2.1.nix | 5 +++--
pkgs/development/libraries/openjpeg/generic.nix | 10 ++++++----
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix
index 2147bab0a6a..dfa5605dec8 100644
--- a/pkgs/development/libraries/openjpeg/1.x.nix
+++ b/pkgs/development/libraries/openjpeg/1.x.nix
@@ -1,7 +1,8 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "${branch}.2";
+ version = "1.5.2";
branch = "1.5";
- sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";
+ revision = "version.1.5.2";
+ sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp";
})
diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix
index 034942b25dd..80026af7be0 100644
--- a/pkgs/development/libraries/openjpeg/2.0.nix
+++ b/pkgs/development/libraries/openjpeg/2.0.nix
@@ -1,7 +1,8 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "${branch}.0.1";
+ version = "2.0.1";
branch = "2";
- sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";
+ revision = "version.2.0.1";
+ sha256 = "1r81hq0hx2papjs3hfmpsl0024f6lblk0bq53dfm2wcpi916q7pw";
})
diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix
index f6b3ce3a9cd..d59ceb9f7a9 100644
--- a/pkgs/development/libraries/openjpeg/2.1.nix
+++ b/pkgs/development/libraries/openjpeg/2.1.nix
@@ -1,7 +1,8 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "${branch}.0";
+ version = "2.1.1";
branch = "2.1";
- sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
+ revision = "v2.1.1";
+ sha256 = "1hrn10byrlw7hb7hwv2zvff89rxy3bsbn0im5ki4kdk63jw5p601";
})
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 03b6faed267..c70bab523cb 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
, libpng, libtiff, lcms2
, mj2Support ? true # MJ2 executables
, jpwlLibSupport ? true # JPWL library & executables
@@ -11,7 +11,7 @@
, testsSupport ? false
, jdk ? null
# Inherit generics
-, branch, sha256, version, ...
+, branch, version, revision, sha256, ...
}:
assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
@@ -26,8 +26,10 @@ in
stdenv.mkDerivation rec {
name = "openjpeg-${version}";
- src = fetchurl {
- url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz";
+ src = fetchFromGitHub {
+ owner = "uclouvain";
+ repo = "openjpeg";
+ rev = revision;
inherit sha256;
};