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: 82d2736d07b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a34175ba56d3
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 8, 2020

  1. zopfli: include all headers

    @tbenst @adisbladis
    tbenst authored and adisbladis committed May 8, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    adisbladis
    GPG key ID: 110BFAD44C6249B7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fd22984 View commit details

Commits on May 9, 2020

  1. libaec: init at 1.0.4

    @tbenst
    tbenst committed May 9, 2020
    Copy the full SHA
    d35bcbb View commit details

  2. Merge pull request #87205 from tbenst/imagecodecs-pkgs 

    libaec: init at 1.0.4; zopfli: include all headers
    @adisbladis
    adisbladis authored May 9, 2020

    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
    a34175b View commit details
Showing with 30 additions and 0 deletions.
  1. +27 −0 pkgs/development/libraries/libaec/default.nix
  2. +1 −0 pkgs/tools/compression/zopfli/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
27 changes: 27 additions & 0 deletions pkgs/development/libraries/libaec/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitLab
, cmake
}:

stdenv.mkDerivation rec {
pname = "libaec";
version = "1.0.4";

src = fetchFromGitLab {
domain = "gitlab.dkrz.de";
owner = "k202009";
repo = "libaec";
rev = "v${version}";
sha256 = "1rpma89i35ahbalaqz82y201syxni7jkf9892jlyyrhhrvlnm4l2";
};

nativeBuildInputs = [
cmake
];

meta = with stdenv.lib; {
homepage = "https://gitlab.dkrz.de/k202009/libaec";
description = "Adaptive Entropy Coding library";
license = licenses.bsd2;
maintainers = with maintainers; [ tbenst ];
};
}
1 change: 1 addition & 0 deletions pkgs/tools/compression/zopfli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {

postInstall = ''
install -Dm444 -t $out/share/doc/zopfli ../README*
cp $src/src/zopfli/*.h $dev/include/
'';

enableParallelBuilding = true;
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -12427,6 +12427,8 @@ in

libacr38u = callPackage ../tools/security/libacr38u { };

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

libagar = callPackage ../development/libraries/libagar { };
libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };