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: 8f63cc6d2523
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2e74e24c855e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 24, 2016

  1. uhd: 3.9.3 -> 3.10.1

    @fpletz
    fpletz committed Nov 24, 2016
    Copy the full SHA
    3ef260b View commit details

  2. gnuradio: 3.7.9.2 -> 3.7.10.1

    @fpletz
    fpletz committed Nov 24, 2016
    Copy the full SHA
    2e74e24 View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/applications/misc/gnuradio/default.nix
  2. +3 −3 pkgs/development/tools/misc/uhd/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/gnuradio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@

stdenv.mkDerivation rec {
name = "gnuradio-${version}";
version = "3.7.9.2";
version = "3.7.10.1";

src = fetchurl {
url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
sha256 = "0qdmakvgq3jxnnqpcn3k4q07vj8ycrbyzv32h76k71cv13w2yrki";
sha256 = "0ds9mcw8hgm03f82jvp3j4mm02ha6zvsl77lp13jzqmbqifbdmv3";
};

buildInputs = [
6 changes: 3 additions & 3 deletions pkgs/development/tools/misc/uhd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,16 +9,16 @@

stdenv.mkDerivation rec {
name = "uhd-${version}";
version = "3.9.3";
version = "3.10.1";

# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf...

src = fetchFromGitHub {
owner = "EttusResearch";
repo = "uhd";
rev = "release_003_009_003";
sha256 = "0nbm8nrjd0l8jj1wq0kkgd8pifzysdyc7pvraq16m0dc01mr638h";
rev = "release_003_010_001_000";
sha256 = "1wypn1cspwx331ah7awajjhnpyjykiif0h1l4fb3lahxvsnkwi51";
};

enableParallelBuilding = true;