diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
| commit | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (patch) | |
| tree | 32834d23912250e0c4b86aa4420baacf8091c0fe /nixpkgs/pkgs/development/libraries/qxlsx | |
| parent | 003ab91dd67b093890db1dd0bab564345db6e496 (diff) | |
| parent | 7a7cfff8915e06365bc2365ff33d4d413184fa9f (diff) | |
| download | nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.gz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.bz2 nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.lz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.xz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.zst nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qxlsx')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qxlsx/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qxlsx/default.nix b/nixpkgs/pkgs/development/libraries/qxlsx/default.nix index b6d92b964452..2626eefa8cd4 100644 --- a/nixpkgs/pkgs/development/libraries/qxlsx/default.nix +++ b/nixpkgs/pkgs/development/libraries/qxlsx/default.nix @@ -1,31 +1,21 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , qtbase }: stdenv.mkDerivation rec { pname = "qxlsx"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "QtExcel"; repo = "QXlsx"; rev = "v${version}"; - hash = "sha256-8plnvyb4sQRfEac1TVWgr2yrtAVAPKucgAnsybdUd3U="; + hash = "sha256-E3x2IUPMRmPSTRN01sXJ0PZaN7iBzatr2vwan2sZxf0="; }; - patches = [ - # Fix header include path - # https://github.com/QtExcel/QXlsx/pull/279 - (fetchpatch { - url = "https://github.com/QtExcel/QXlsx/commit/9d6db9efb92b93c3663ccfef3aec05267ba43723.patch"; - hash = "sha256-EbE5CNACAcgENCQh81lBZJ52hCIcBsFhNnYOS0Wr25I="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase ]; |