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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2021-04-06 16:01:14 +02:00
parent 44e3fc61fe 413e9561f8
commit c04a14edd6
493 changed files with 4687 additions and 2055 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/monotone-viz/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib
, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
}:
# We need an old version of Graphviz for format compatibility reasons.
# This version is vulnerable, but monotone-viz will never feed it bad input.
let graphviz_2_0 = import ./graphviz-2.0.nix {
inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw
yacc libtool fontconfig pango gd libwebp;
bison libtool fontconfig pango gd libwebp;
}; in
let inherit (gnome2) libgnomecanvas; in
let inherit (ocamlPackages) ocaml lablgtk camlp4; in
pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd, libwebp
, bison, libtool, fontconfig, pango, gd, libwebp
}:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xlibsWrapper libpng libjpeg expat libXaw yacc
xlibsWrapper libpng libjpeg expat libXaw bison
libtool fontconfig pango gd libwebp
];