diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-10-19 12:46:38 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-10-19 12:46:38 +0300 |
| commit | 0bc4216bf0d7e451ecec5f2c5bcad0cba80930b8 (patch) | |
| tree | ba615a84961f59364c6798c8867c51f48d17b320 /pkgs/tools | |
| parent | c0e00efdaeaeaf799452198efa201d086ed83238 (diff) | |
| parent | ee9c59c5b3b65d31abdb4f7a8cc645f63ebee24c (diff) | |
| download | nixpkgs-0bc4216bf0d7e451ecec5f2c5bcad0cba80930b8.tar nixpkgs-0bc4216bf0d7e451ecec5f2c5bcad0cba80930b8.tar.gz nixpkgs-0bc4216bf0d7e451ecec5f2c5bcad0cba80930b8.tar.bz2 nixpkgs-0bc4216bf0d7e451ecec5f2c5bcad0cba80930b8.tar.lz nixpkgs-0bc4216bf0d7e451ecec5f2c5bcad0cba80930b8.tar.xz nixpkgs-0bc4216bf0d7e451ecec5f2c5bcad0cba80930b8.tar.zst nixpkgs-0bc4216bf0d7e451ecec5f2c5bcad0cba80930b8.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/povray/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/snapper/default.nix | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 6bdff06699b..7284ee95a90 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "povray-${version}"; - version = "3.7.0.3"; + version = "3.7.0.4"; src = fetchFromGitHub { owner = "POV-Ray"; repo = "povray"; rev = "v${version}"; - sha256 = "0mzkgk3gn8jfrw1fq0z3kqbysdfq8nwdl8a28l18v8gzb31bblhq"; + sha256 = "1wkwb43w5r9pa79yazy4w4s8n6g280igag97hgl7dyi289q39n0q"; }; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 9895fff3ba8..4b7857d60e7 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, utillinux }: @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { sha256 = "14hrv23film4iihyclcvc2r2dgxl8w3as50r81xjjc85iyp6yxkm"; }; + patches = [ + # Fix build with new Boost + (fetchpatch { + url = "https://github.com/openSUSE/snapper/commit/2e3812d2c1d1f54861fb79f5c2b0197de96a00a3.patch"; + sha256 = "0yrzss1v7lmcvkajmchz917yqsvlsdfz871szzw790v6pql1322s"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig docbook_xsl libxslt docbook_xml_dtd_45 |