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: 873cbb9dac6d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 069329c5bb22
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 25, 2021

  1. libzip: 1.6.1 -> 1.7.3 

    libzip's pkgconfig paths are now fixed on git master
and the patch backports cleanly.
    @r-burns
    r-burns committed Jan 25, 2021
    Copy the full SHA
    4609c36 View commit details

  2. Merge pull request #106699 from r-burns/libzip 

    [staging] libzip: 1.6.1 -> 1.7.3
    @jtojnar
    jtojnar authored Jan 25, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    069329c View commit details
Showing with 16 additions and 9 deletions.
  1. +16 −9 pkgs/development/libraries/libzip/default.nix
25 changes: 16 additions & 9 deletions pkgs/development/libraries/libzip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
{ lib, stdenv, fetchurl, cmake, perl, zlib }:
{ lib, stdenv
, cmake
, fetchpatch
, fetchurl
, perl
, zlib
}:

stdenv.mkDerivation rec {
pname = "libzip";
version = "1.6.1";
version = "1.7.3";

src = fetchurl {
url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz";
sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6";
sha256 = "1k5rihiz7m1ahhjzcbq759hb9crzqkgw78pkxga118y5a32pc8hf";
};

# Fix pkg-config file paths
postPatch = ''
sed -i CMakeLists.txt \
-e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \
-e 's#\\''${prefix}/''${CMAKE_INSTALL_INCLUDEDIR}#''${CMAKE_INSTALL_FULL_INCLUDEDIR}#'
'';
# Remove in next release
patches = [
(fetchpatch {
url = "https://github.com/nih-at/libzip/commit/351201419d79b958783c0cfc7c370243165523ac.patch";
sha256 = "0d93z98ki0yiaza93268cxkl35y1r7ll9f7l8sivx3nfxj2c1n8a";
})
];

outputs = [ "out" "dev" ];