diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:03:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:53:38 +0200 |
| commit | 6c2fbfbd7720446821be2a506cefcd1e0ff3b42d (patch) | |
| tree | ef852f77f02c1636e2ee215623d6a20e87174b9e /pkgs/applications/science | |
| parent | 81df0354290389128077e00edfd2368eeeea0c24 (diff) | |
| parent | 3d932ba135f9fe7eb649269543276dffa7aa563a (diff) | |
| download | nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.gz nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.bz2 nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.lz nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.xz nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.zst nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/electronics/pulseview/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/leo2/default.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 07724d93254..595ad9eeb0a 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -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; { diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 95012f90a94..da4517cd6b0 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -13,7 +13,7 @@ let baseName="leo2"; version = "1.6.2"; name="${baseName}_v${version}"; - url="page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; + url = "http://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; hash="d46a94f5991623386eb9061cfb0d748e258359a8c690fded173d35303e0e9e3a"; }; in |