Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bd736e6aa77d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ff6d0c21d57
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 10, 2019

  1. pulseview: 0.4.0 -> 0.4.1 

    https://sigrok.org/gitweb/?p=pulseview.git;a=blob;f=NEWS;h=69c7ac5d418bbae896906b8c6b64c6719b1912db;hb=05a4de8abd5810cf8219077259ffa44adb08043e
    @dtzWill @bjornfor
    dtzWill authored and bjornfor committed Jun 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    94774da View commit details

  2. libsigrok: 0.5.0 -> 0.5.1, firmware 0.1.3 -> 0.1.6

    @dtzWill @bjornfor
    dtzWill authored and bjornfor committed Jun 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2ff6d0c View commit details
Showing with 7 additions and 7 deletions.
  1. +2 −2 pkgs/applications/science/electronics/pulseview/default.nix
  2. +5 −5 pkgs/development/tools/libsigrok/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/electronics/pulseview/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
}:

stdenv.mkDerivation rec {
name = "pulseview-0.4.0";
name = "pulseview-0.4.1";

src = fetchurl {
url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz";
sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q";
sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy";
};

nativeBuildInputs = [ cmake pkgconfig ];
10 changes: 5 additions & 5 deletions pkgs/development/tools/libsigrok/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check
, libserialport, librevisa, doxygen, glibmm, python
, version ? "0.5.0", sha256 ? "197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c"
, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
}:

stdenv.mkDerivation rec {
inherit version;
name = "libsigrok-${version}";
pname = "libsigrok";

src = fetchurl {
url = "https://sigrok.org/download/source/libsigrok/${name}.tar.gz";
url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";
inherit sha256;
};

firmware = fetchurl {
url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz";
sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl";
url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.6.tar.gz";
sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw";
};

nativeBuildInputs = [ pkgconfig ];