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

Merge remote-tracking branch 'origin/master' into hardened-stdenv

Browse Source
This commit is contained in:
Franz Pletz
2016-05-18 17:10:02 +02:00
parent 9fbc20e2f8 3cd63ade16
commit f8d481754c
1470 changed files with 62103 additions and 28701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/electronics/pulseview/default.nix
+4 -4
View File
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, cmake, glib, qt4, boost, libsigrok
, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi
, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi, glibmm
}:
stdenv.mkDerivation rec {
name = "pulseview-0.2.0";
name = "pulseview-0.3.0";
src = fetchurl {
url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz";
sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy";
sha256 = "03jk5xpsird5ssbnwkxw57jnqvnnpivhqh1xjdhdrz02lsvjrzjz";
};
buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok
libsigrokdecode libserialport libzip udev libusb1 libftdi
libsigrokdecode libserialport libzip udev libusb1 libftdi glibmm
];
meta = with stdenv.lib; {
pkgs/applications/science/electronics/tkgate/1.x.nix
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor";
homepage = "http://www.tkgate.org/";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.simons ];
maintainers = [ stdenv.lib.maintainers.peti ];
hydraPlatforms = stdenv.lib.platforms.linux;
};
}