diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-03-15 10:36:38 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-16 11:37:19 +0000 |
commit | d435710923ac6e6f9fc155534800745004f2ce93 (patch) | |
tree | 386f9401476f96bdc6ec25173a090198942b5d5b /nixpkgs/pkgs/applications/graphics/hugin | |
parent | c725f0011e91ae49d351b981690eb66b862b6104 (diff) | |
parent | 3239fd2b8f728106491154b44625662e10259af2 (diff) | |
download | nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.gz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.bz2 nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.lz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.xz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.zst nixlib-d435710923ac6e6f9fc155534800745004f2ce93.zip |
Merge commit '3239fd2b8f728106491154b44625662e10259af2'
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/hugin')
-rw-r--r-- | nixpkgs/pkgs/applications/graphics/hugin/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/hugin/default.nix b/nixpkgs/pkgs/applications/graphics/hugin/default.nix index ec2ac709f868..3e68a4b9467d 100644 --- a/nixpkgs/pkgs/applications/graphics/hugin/default.nix +++ b/nixpkgs/pkgs/applications/graphics/hugin/default.nix @@ -5,7 +5,6 @@ , gnumake , makeWrapper , pkg-config -, fetchpatch , autopanosiftc , boost , cairo @@ -37,21 +36,13 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2019.0.0"; + version = "2021.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr"; + sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk="; }; - patches = [ - # Fixes build with exiv2 0.27.1 - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0467d8ba362b9c196e4c1dc4be7de0c1b336335b/hugin/trunk/hugin-exiv2-0.27.1.patch"; - sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r"; - }) - ]; - buildInputs = [ boost cairo |