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

Commits on Oct 25, 2018

  1. openjpeg_2: rename from openjpeg_2_1 at 2.3.0

    @orivej
    orivej committed Oct 25, 2018
    Copy the full SHA
    d09961c View commit details

  2. eccodes: build with openjpeg 

    It did not look for openjpeg-2.3 and was built without openjpeg support.
    @orivej
    orivej committed Oct 25, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    ruyadorno Ruy Adorno
    GPG key ID: 97B01419BD92F80A
    Verified
    Learn about vigilant mode
    Copy the full SHA
    62ce2bb View commit details
6 changes: 5 additions & 1 deletion pkgs/development/libraries/eccodes/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
, enablePython ? false, pythonPackages
, enablePosixThreads ? false
, enableOpenMPThreads ? false}:
with stdenv.lib;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "eccodes-${version}";
version = "2.9.0";
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z";
};

postPatch = ''
substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir}
'';

nativeBuildInputs = [ cmake ];

buildInputs = [ netcdf
0 pkgs/development/libraries/openjpeg/2.1.nix → pkgs/development/libraries/openjpeg/2.x.nix
View file
File renamed without changes.
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -205,6 +205,7 @@ mapAliases ({
opencascade_oce = opencascade; # added 2018-04-25
opencl-icd = ocl-icd; # added 2017-01-20
openexr_ctl = ctl; # added 2018-04-25
openjpeg_2_1 = openjpeg_2; # added 2018-10-25
openssh_with_kerberos = openssh; # added 2018-01-28
owncloudclient = owncloud-client; # added 2016-08
p11_kit = p11-kit; # added 2018-02-25
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -11590,8 +11590,8 @@ with pkgs;
openh264 = callPackage ../development/libraries/openh264 { };

openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
openjpeg = openjpeg_2_1;
openjpeg_2 = callPackage ../development/libraries/openjpeg/2.x.nix { };
openjpeg = openjpeg_2;

openpa = callPackage ../development/libraries/openpa { };