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

Commits on Nov 10, 2018

  1. armadillo: 9.100.5 -> 9.200.4 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/armadillo/versions
    @r-ryantm
    r-ryantm committed Nov 10, 2018
    Copy the full SHA
    67c7685 View commit details

Commits on Nov 11, 2018

  1. gnss-sdr: turn off unit tests explicitly

    @markuskowa
    markuskowa committed Nov 11, 2018
    Copy the full SHA
    0528001 View commit details

  2. Merge pull request #50199 from r-ryantm/auto-update/armadillo 

    armadillo: 9.100.5 -> 9.200.4
    @markuskowa
    markuskowa authored Nov 11, 2018
    Copy the full SHA
    f45f285 View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −0 pkgs/applications/misc/gnss-sdr/default.nix
  2. +2 −2 pkgs/development/libraries/armadillo/default.nix
1 change: 1 addition & 0 deletions pkgs/applications/misc/gnss-sdr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DGFlags_ROOT_DIR=${google-gflags}/lib"
"-DGLOG_INCLUDE_DIR=${glog}/include"
"-DENABLE_UNIT_TESTING=OFF"

# gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as
# armadillo is built using both, so skip checking for them.
4 changes: 2 additions & 2 deletions pkgs/development/libraries/armadillo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:

stdenv.mkDerivation rec {
version = "9.100.5";
version = "9.200.4";
name = "armadillo-${version}";

src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby";
sha256 = "0rkry405vacvlvkc7xdkzh20zf7yni9hsp65v0dby91na0wcrl8h";
};

nativeBuildInputs = [ cmake ];