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: 96d73edaf33f
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: d942688fc137
Choose a head ref
  • 5 commits
  • 3 files changed
  • 5 contributors

Commits on Dec 17, 2019

  1. remmina: 1.3.4 -> 1.3.7 

    According to the release notes this is a
"This release is meant to prepare the stable release for January, before the freeze in Debian an Ubuntu ".
Not sure what that means, but I expect a stable release
in NixOS 20.03 for sure.

https://gitlab.com/Remmina/Remmina/-/tags/v1.3.7
    @worldofpeace
    worldofpeace committed Dec 17, 2019
    Copy the full SHA
    586df03 View commit details

  2. 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. 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

  2. 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

  3. remmina: 1.3.4 -> 1.3.7 (#75811) 

    remmina: 1.3.4 -> 1.3.7
    @gebner
    gebner authored Dec 18, 2019
    Copy the full SHA
    d942688 View commit details
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;
9 changes: 5 additions & 4 deletions pkgs/applications/networking/remote/remmina/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, pcre, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz
# The themes here are soft dependencies; only icons are missing without them.
, gnome3
}:
@@ -13,13 +13,13 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "remmina";
version = "1.3.4";
version = "1.3.7";

src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
sha256 = "18p6v2lalpiba0r318grlc2bvqh2qlpjw811i0934g33faviyfj1";
sha256 = "076vz6nzs8v4d44dklsfgmwyhp48c2iywixg032znz193anjcgqn";
};

nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
pcre libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
openssl gnome3.adwaita-icon-theme json-glib
openssl gnome3.adwaita-icon-theme json-glib libsodium webkitgtk
harfbuzz
];

cmakeFlags = [
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;