public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging'

Browse Source
This commit is contained in:
Nikolay Amiantov
2017-10-19 12:46:38 +03:00
parent c0e00efdae ee9c59c5b3
commit 0bc4216bf0
15 changed files with 88 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/graphics/povray/default.nix
View File

@@ -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";
};

10
pkgs/tools/misc/snapper/default.nix
View File

@@ -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