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

Merge branch 'master'

Browse Source
This commit is contained in:
Vladimír Čunát
2018-03-05 14:53:27 +01:00
parent 25a78f7234 97693915e1
commit 565bd805e6
1666 changed files with 26733 additions and 31238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/electronics/pcb/default.nix
+9 -2
View File
@@ -1,4 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }:
{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex
, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined
, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg
}:
stdenv.mkDerivation rec {
name = "pcb-${version}";
@@ -10,7 +13,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper libGLU_combined tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ];
buildInputs = [
gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper
libGLU_combined tcl shared-mime-info tk
gnome2.gtkglext pangox_compat gd xorg.libXmu
];
configureFlags = ["--disable-update-desktop-database"];
pkgs/applications/science/electronics/verilator/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "verilator-${version}";
version = "3.900";
version = "3.920";
src = fetchurl {
url = "http://www.veripool.org/ftp/${name}.tgz";
sha256 = "0yvbibcysdiw6mphda0lfs56wz6v450px2420x0hbd3rc7k53s2b";
sha256 = "1zs3d6h5sbz455fwpgg89h81hkfn92ary8bmhjinc1rd8fm3hp1b";
};
enableParallelBuilding = true;