Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c551f2db16f4
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05aa59afa639
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Dec 17, 2019

  1. sundials: replace liblapack by openblas

    @smaret
    smaret committed Dec 17, 2019
    Copy the full SHA
    a5dd19d View commit details

Commits on Dec 18, 2019

  1. release: remove metrics from unstable channel (temporarily) 

    Since friday the metrics machine (along with other replaceable ones)
has no public-IP connectivity.  I hoped I'd be able to resolve this
with ISP quickly, but apparently not.  Let's not block the channel
at least.  The metrics data can get filled retrospectively by restarting
the individual Hydra jobs.
    @vcunat
    vcunat committed Dec 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    96d73ed View commit details

  2. Merge pull request #75823 from smaret/sundials-openblas 

    sundials: replace liblapack by openblas
    @flokli
    flokli authored Dec 18, 2019
    Copy the full SHA
    c8c7398 View commit details

  3. franz: fix Exec substitution in franz.desktop 

    Signed-off-by: David Wood <david.wood@codeplay.com>
    @davidtwco
    davidtwco authored and Matthieu Coudron committed Dec 18, 2019
    Copy the full SHA
    05aa59a View commit details
Showing with 6 additions and 8 deletions.
  1. +1 −1 pkgs/applications/networking/instant-messengers/franz/default.nix
  2. +4 −6 pkgs/development/libraries/sundials/default.nix
  3. +1 −1 pkgs/top-level/release.nix
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/franz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ in stdenv.mkDerivation {
# provide desktop item and icon
cp -r usr/share $out
substituteInPlace $out/share/applications/franz.desktop \
--replace Exec=\"/opt/Franz/franz\" Exec=franz
--replace /opt/Franz/franz franz
'';

dontWrapGApps = true;
10 changes: 4 additions & 6 deletions pkgs/development/libraries/sundials/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,19 +2,17 @@
, cmake
, fetchurl
, python
, liblapack
, openblas
, gfortran
, lapackSupport ? true }:

let liblapackShared = liblapack.override {
shared = true;
};
let openblas32 = openblas.override { blas64 = false; };

in stdenv.mkDerivation rec {
pname = "sundials";
version = "5.0.0";

buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ];
buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran openblas32 ];
nativeBuildInputs = [ cmake ];

src = fetchurl {
@@ -40,7 +38,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals (lapackSupport) [
"-DSUNDIALS_INDEX_TYPE=int32_t"
"-DLAPACK_ENABLE=ON"
"-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DLAPACK_LIBRARIES=${openblas32}/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary}"
];

doCheck = true;
2 changes: 1 addition & 1 deletion pkgs/top-level/release.nix
View file
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ let
meta.description = "Release-critical builds for the Nixpkgs unstable channel";
constituents =
[ jobs.tarball
jobs.metrics
#jobs.metrics #FIXME(vcunat): re-enable this as soon as possible
jobs.manual
jobs.lib-tests
jobs.stdenv.x86_64-linux