diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/freexl | |
parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/freexl')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/freexl/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/freexl/default.nix b/nixpkgs/pkgs/development/libraries/freexl/default.nix index 7bc1322ccc8c..ac5609425b56 100644 --- a/nixpkgs/pkgs/development/libraries/freexl/default.nix +++ b/nixpkgs/pkgs/development/libraries/freexl/default.nix @@ -1,17 +1,29 @@ -{ lib, stdenv, fetchurl, validatePkgConfig, libiconv }: +{ lib +, stdenv +, fetchurl +, validatePkgConfig +, expat +, minizip +, zlib +, libiconv +}: stdenv.mkDerivation rec { pname = "freexl"; - version = "1.0.6"; + version = "2.0.0"; src = fetchurl { url = "https://www.gaia-gis.it/gaia-sins/freexl-${version}.tar.gz"; - hash = "sha256-Pei1ej0TDLKIHqUtOqnOH+7bG1e32qTrN/dRQE+Q/CI="; + hash = "sha256-F2cF8d5Yq3we679cbeRqt2/Ni4VlCNvSj1ZI98bhp/A="; }; nativeBuildInputs = [ validatePkgConfig ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = [ + expat + minizip + zlib + ] ++ lib.optional stdenv.isDarwin libiconv; enableParallelBuilding = true; |