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: d6b10a59d392
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48144e257a84
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 31, 2019

  1. uhd: 3.13.0.1 -> 3.14.0.0

    @dtzWill
    dtzWill committed May 31, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    74c3bec View commit details

  2. Merge pull request #62306 from dtzWill/update/uhd-3.14.0.0 

    uhd: 3.13.0.1 -> 3.14.0.0
    @fpletz
    fpletz authored May 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48144e2 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/radio/uhd/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/radio/uhd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,12 +12,12 @@ let

# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf... style keeps changing
version = "3.13.0.1";
version = "3.14.0.0";

# Firmware images are downloaded (pre-built) from the respective release on Github
uhdImagesSrc = fetchurl {
url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz";
sha256 = "0y9i93z188ch0hdlkvv0k9m0k7vns7rbxaqsnk35xnlqlxxgqdvj";
sha256 = "1fp37wgqkbr14cxg9l7ghfd4r92y2bxwgb7cfjzs96hbpd9s6al0";
};

in stdenv.mkDerivation {
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
owner = "EttusResearch";
repo = "uhd";
rev = "${uhdVer}";
sha256 = "0si49qk96zhpanmcrzlr3igc5s1y30x4p0z973q60dx9fhqsbb6k";
sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy";
};

enableParallelBuilding = true;