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

Commits on Aug 8, 2019

  1. gnss-sdr: 0.0.9 -> 0.0.11

    @markuskowa
    markuskowa committed Aug 8, 2019
    Copy the full SHA
    1d428e8 View commit details

Commits on Aug 12, 2019

  1. Merge pull request #66342 from markuskowa/upd-gnss 

    gnss-sdr: 0.0.9 -> 0.0.11
    @markuskowa
    markuskowa authored Aug 12, 2019
    Copy the full SHA
    4553291 View commit details
Showing with 14 additions and 2 deletions.
  1. +14 −2 pkgs/applications/radio/gnss-sdr/default.nix
16 changes: 14 additions & 2 deletions pkgs/applications/radio/gnss-sdr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,17 +11,22 @@
, pkgconfig
, pythonPackages
, uhd
, log4cpp
, openblas
, matio
, pugixml
, protobuf
}:

stdenv.mkDerivation rec {
name = "gnss-sdr-${version}";
version = "0.0.9";
version = "0.0.11";

src = fetchFromGitHub {
owner = "gnss-sdr";
repo = "gnss-sdr";
rev = "v${version}";
sha256 = "0gis932ly3vk7d5qvznffp54pkmbw3m6v60mxjfdj5dd3r7vf975";
sha256 = "0ajj0wx68yyzigppxxa1wag3hzkrjj8dqq8k28rj0jhp8a6bw2q7";
};

buildInputs = [
@@ -40,6 +45,11 @@ stdenv.mkDerivation rec {
# UHD support is optional, but gnuradio is built with it, so there's
# nothing to be gained by leaving it out.
uhd
log4cpp
openblas
matio
pugixml
protobuf
];

enableParallelBuilding = true;
@@ -53,6 +63,8 @@ stdenv.mkDerivation rec {
# armadillo is built using both, so skip checking for them.
"-DBLAS=YES"
"-DLAPACK=YES"
"-DBLAS_LIBRARIES=-lopenblas"
"-DLAPACK_LIBRARIES=-lopenblas"

# Similarly, it doesn't actually use gfortran despite checking for
# its presence.